[add] Higher than zero asserting

Also changed the logout endpoint to get

api-payroll/public/css/login.css

@@ -0,0 +1,81 @@
+body {
+    background: url(../imagenes/grey_background.jpg);
+    background-size: cover;
+    font-family: Montserrat;
+}
+@media only screen and (min-device-width: 480px) {
+    body {
+        background: url('../imagenes/grey_background.jpg') no-repeat fixed center center;
+    }
+}
+.logo {
+    width: 213px;
+    height: 60px;
+    margin: 30px auto;
+}
+.login-block {
+    width: 320px;
+    padding: 20px;
+    background: #fff;
+    border-radius: 5px;
+    border-top: 5px solid #bdb035;
+    margin: 0 auto;
+}
+.login-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+.login-block input {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    font-family: Montserrat;
+    padding: 0 20px 0 50px;
+    outline: none;
+}
+.login-block input#user {
+    background: #fff url('../imagenes/login_username.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#user:focus {
+    background: #fff url('../imagenes/login_username.png') 20px bottom no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#password {
+    background: #fff url('../imagenes/login_password.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#password:focus {
+    background: #fff url('../imagenes/login_password.png') 20px bottom no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input:active, .login-block input:focus {
+    border: 1px solid #bdb035;
+}
+.login-block #loginButon {
+    width: 100%;
+    height: 40px;
+    background: #bdb035;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #6d661c;
+    color: #fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    font-family: Montserrat;
+    outline: none;
+    cursor: pointer;
+}
+.login-block button:hover {
+    background: #c7b935;
+    border: 1px solid #6d661c;
+}

api-payroll/public/html/login.php

@@ -0,0 +1,44 @@
+<!-- Latest compiled and minified CSS -->
+<link rel="stylesheet" href="../css/bootstrap.min.css">
+
+<!-- jQuery library -->
+<script src="../js/jquery.min.js"></script>
+
+<!-- Latest compiled JavaScript -->
+<script src="../js/bootstrap.min.js"></script>
+
+<link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
+<div class="container">
+    <div class="logo"></div>
+    <div class="login-block">
+        <form action="" method="post" name="Login_Form" class="login">
+            <h1>Login</h1>
+            <input type="text" value="" placeholder="User" id="userName" name="user" required="" autofocus=""/>
+            <input type="password" value="" placeholder="Password" id="password" name="password" required=""/>
+            <a href="#" class="btn btn-lg btn-warning btn-default" id="loginButon" name="login" value="Login" onclick="processLogin();">Login</a>
+        </form>
+    </div>
+</div>
+
+<div id="modalLoginError" class="modal fade" role="dialog">
+    <div class="modal-dialog">
+
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header" id="modalLoginErrorHeader">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title"><center>Ha ocurrido un error</center></h4>
+            </div>
+            <div class="modal-body">
+                <p id="modalLoginErrorBody"></p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+            </div>
+        </div>
+
+    </div>
+</div>
+
+<script src="../js/login.js"></script>
+<link href="../css/login.css" rel="stylesheet">

api-payroll/public/js/login.js

@@ -0,0 +1,38 @@
+function getbaseUrl(uriPath){
+    var url = window.location.href;
+    return url.substring(0, url.indexOf(uriPath));
+}
+
+function processLogin() {
+console.log(getbaseUrl('html/'));
+    var parametros = {
+        "userName":$('#userName').val(),
+        "password":$('#password').val()
+    };
+
+    $.ajax({
+        url: getbaseUrl('/html/') + '/index.php/api/session/login',
+        type: 'POST',
+        dataType: 'json',
+        data: parametros,
+        success:function(data){
+            console.log(JSON.stringify(data));
+            if(data["status"] == "success"){
+                redirect("http://stackoverflow.com");
+            }else if(data["status"] == "success" || (data["status"] === undefined)){
+                $('#modalLoginError').modal('show');
+                document.getElementById('modalLoginErrorBody').innerHTML = "The server didn't respond in time, please try again or refresh this page.";
+            }
+        },
+        error:function(x) {
+            if (x.status==500){
+                $('#modalLoginError').modal('show');
+                document.getElementById('modalLoginErrorBody').innerHTML = "The user or password didnt match, please try again";
+            }
+        },
+    });
+}
+
+function redirect(url){
+    window.location.replace(url);
+}

api-payroll/src/application/EmployeeApplication.php

@@ -38,7 +38,12 @@ class EmployeeApplication{
         }
         $stmt = null;
 
-        return $results;
+        $employeeTypes = array();
+        foreach($results as $row){
+            $employeeTypes[] = array('id' => (int)$row['id'], 'name' => $row['name']);
+        }
+
+        return $employeeTypes;
     }
 
     /**
@@ -51,11 +56,11 @@ class EmployeeApplication{
      * @return integer
      */
     function saveNewPerson($firstName, $middleName, $lastName, $birthDate, $email, $phone){
-        $this->asserts->firstName($firstName);
+        $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
-        $this->asserts->middleName($middleName);
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
-        $this->asserts->birthDate($birthDate);
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
-        $this->asserts->email($email);
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
-        $this->asserts->phone($phone);
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
 
         try {
             $stmt = $this->pdo->prepare("INSERT INTO persons (firstName, middleName, lastName, birthDate, email, phone) 
@@ -84,6 +89,10 @@ class EmployeeApplication{
      * @return mixed
      */
     function savePersonAsEmployee($idEmployeeType, $idPerson, $code, $contractType){
+        $this->asserts->higherThanZero($idEmployeeType, "idEmployeeType must be higher than 0");
+        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
         try {
             $stmt = $this->pdo->prepare("INSERT INTO employees (idEmployeeType, idPerson, code, contractType) 
                                           VALUES (:idEmployeeType, :idPerson, :code, :contractType)");
@@ -110,21 +119,29 @@ class EmployeeApplication{
     function saveNewEmployee($requestData){
         // Getting and validating the data
         $firstName = $requestData['firstName'];
-        $this->asserts->firstName($firstName);
+        $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
+        $this->asserts->isString($firstName, "The first name must be a string.");
+        $this->asserts->betweenLength($firstName, 1, 50, "The first name must have a length between 1 and 50 characters.");
 
         $middleName = $requestData['middleName'];
-        $this->asserts->middleName($middleName);
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
+        $this->asserts->isString($middleName, "The middle name must be a string.");
+        $this->asserts->betweenLength($middleName, 1, 50, "The middle name must have a length between 1 and 50 characters.");
 
-        $lastName = isset($requestData['lastName']) ? $requestData['lastName'] : null;
+        $lastName = isset($requestData['lastName'])
+            ? $requestData['lastName']
+            : null;
 
         $birthDate = $requestData['birthDate'];
-        $this->asserts->birthDate($birthDate);
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
 
         $email = $requestData['email'];
-        $this->asserts->email($email);
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
+        $this->asserts->betweenLength($email, 1, 100, "The middle name must have a length between 1 and 100 characters.");
 
         $phone = $requestData['phone'];
-        $this->asserts->phone($phone);
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
+        $this->asserts->betweenLength($phone, 10, 10, "The phone number must be 10 digits without special characters.");
 
         $idEmployeeType = $requestData{'idEmployeeType'};
         $contractType = $requestData{'contractType'};
@@ -164,6 +181,8 @@ class EmployeeApplication{
      * @return Integer
      */
     function getIdPersonByIdEmployee($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
         $stmt = $this->pdo->prepare("SELECT 
                                         COALESCE((SELECT 
                                                         idPerson
@@ -184,10 +203,12 @@ class EmployeeApplication{
     }
 
     /**
-     * @param $code
+     * @param $code string
-     * @return mixed
+     * @return integer
      */
     function getIdEmployeeTypeByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
         $stmt = $this->pdo->prepare("SELECT COALESCE((SELECT 
                                         et.id
                                     FROM
@@ -214,6 +235,8 @@ class EmployeeApplication{
      * @return array
      */
     function getEmployeeDataById($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
         $stmt = $this->pdo->prepare("SELECT 
                                         p.id AS idPerson,
                                         p.firstName,
@@ -248,6 +271,8 @@ class EmployeeApplication{
      * @return array
      */
     function proxyGetEmployeeDataById($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
         $employeeData = $this->getEmployeeDataById($idEmployee);
 
         $response = array(
@@ -274,6 +299,8 @@ class EmployeeApplication{
      * @return array
      */
     function getEmployeeDataByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
         $idEmployee = $this->getIdEmployeeTypeByCode($code);
 
         return $this->proxyGetEmployeeDataById($idEmployee);
@@ -289,6 +316,13 @@ class EmployeeApplication{
      * @param $phone string
      */
     function updatePerson($idPerson, $firstName, $middleName, $lastName, $birthDate, $email, $phone){
+        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
+        $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
+
         try {
             $stmt = $this->pdo->prepare("UPDATE persons 
                                         SET 
@@ -318,6 +352,11 @@ class EmployeeApplication{
      * @param $contractType string
      */
     function updateEmployee($idEmployee, $code, $idEmployeeType, $contractType){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+        $this->asserts->higherThanZero($idEmployeeType, "idEmployeeType must be higher than 0");
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
+
         try {
             $stmt = $this->pdo->prepare("UPDATE employees 
                                         SET 
@@ -344,28 +383,42 @@ class EmployeeApplication{
     function updateEmployeeData($requestData){
         // Getting and validating the data
         $idEmployee = $requestData['idEmployee'];
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
         $idPerson = $this->getIdPersonByIdEmployee($idEmployee);
+        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
+
         $code = $requestData['code'];
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
         $firstName = $requestData['firstName'];
-        $this->asserts->firstName($firstName);
+        $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
+        $this->asserts->isString($firstName, "The first name must be a string.");
+        $this->asserts->betweenLength($firstName, 1, 50, "The first name must have a length between 1 and 50 characters.");
 
         $middleName = $requestData['middleName'];
-        $this->asserts->middleName($middleName);
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
+        $this->asserts->isString($middleName, "The middle name must be a string.");
+        $this->asserts->betweenLength($middleName, 1, 50, "The middle name must have a length between 1 and 50 characters.");
 
         $lastName = isset($requestData['lastName']) ? $requestData['lastName'] : null;
 
         $birthDate = $requestData['birthDate'];
-        $this->asserts->birthDate($birthDate);
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
 
         $email = $requestData['email'];
-        $this->asserts->email($email);
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
+        $this->asserts->betweenLength($email, 1, 100, "The middle name must have a length between 1 and 100 characters.");
 
         $phone = $requestData['phone'];
-        $this->asserts->phone($phone);
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
+        $this->asserts->betweenLength($phone, 10, 10, "The phone number must be 10 digits without special characters.");
 
         $idEmployeeType = $requestData{'idEmployeeType'};
+        $this->asserts->higherThanZero($idEmployeeType, "idEmployeeType must be higher than 0");
+
         $contractType = $requestData{'contractType'};
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
 
         // Encrypting the sensitive data
         $securedFirstName = $this->cryptographyService->encryptString($firstName);
@@ -399,6 +452,8 @@ class EmployeeApplication{
     }
 
     function disableEmployeeRecord($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
         try {
             $stmt = $this->pdo->prepare("UPDATE employees 
                                         SET 
@@ -442,6 +497,9 @@ class EmployeeApplication{
         return $results;
     }
 
+    /**
+     * @return array
+     */
     function listAllActiveEmployees(){
         $ids = $this->getIdEmployeeFromAllActiveEmployees();
 

api-payroll/src/application/SessionApplication.php

@@ -43,7 +43,9 @@ class SessionApplication{
      * @return mixed
      */
     function getPassword($userName){
-        $this->asserts->userName($userName);
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");
 
         $stmt = $this->pdo->prepare("SELECT password FROM users WHERE name = :userName");
         $stmt->execute(array(':userName' => $userName));
@@ -62,14 +64,18 @@ class SessionApplication{
      * @throws Exception
      */
     function newSession($userName, $password){
-        $this->asserts->userName($userName);
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
-        $this->asserts->password($password);
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");
+        $this->asserts->isNotEmpty($password, "The password can't be empty");
+        $this->asserts->isString($password, "The password must be a string.");
+        $this->asserts->betweenLength($password, 1, 50, "The password must have a length between 1 and 50 characters.");
 
         $storedPassword = $this->getPassword($userName);
 
         // If the credentials don't match anything in the the records
         if(!isset($storedPassword)){
-            throw new Exception('The user or password didnt match, please try again.');
+            return false;
         }
 
         // Already has a session
@@ -82,7 +88,30 @@ class SessionApplication{
             return true;
         }
         else{
-            return false;
+            throw new Exception('The user or password didnt match, please try again.');
+        }
+    }
+
+    /**
+     * @param $userName
+     * @param $password
+     * @return array
+     * @throws Exception
+     */
+    function login($userName, $password){
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");
+        $this->asserts->isNotEmpty($password, "The password can't be empty");
+        $this->asserts->isString($password, "The password must be a string.");
+        $this->asserts->betweenLength($password, 1, 50, "The password must have a length between 1 and 50 characters.");
+
+
+        if($this->newSession($userName, $password)){
+            return array('status' => 'success', 'message' => 'Logged in successfully.');
+        }
+        else{
+            throw new Exception('The user or password didnt match, please try again.');
         }
     }
 

api-payroll/src/routes.php

@@ -22,14 +22,14 @@ $app->get('/api/session', function (Request $request, Response $response, array
 $app->post('/api/session/login', function ($request, $response) {
     $requestData = $request->getParsedBody();
 
-    $data = $this->sessionApplication->newSession($requestData['userName'], $requestData['password']);
+    $data = $this->sessionApplication->login($requestData['userName'], $requestData['password']);
 
     return $response->withStatus(200)
         ->withHeader('Content-Type', 'application/json')
         ->write(json_encode($data));
 });
 
-$app->post('/api/session/logout', function (Request $request, Response $response, array $args) {
+$app->get('/api/session/logout', function (Request $request, Response $response, array $args) {
     return $response->withStatus(200)
         ->withHeader('Content-Type', 'application/json')
         ->write(json_encode($this->sessionApplication->destroySession()));

api-payroll/src/service/Asserts.php

@@ -6,78 +6,54 @@ use Respect\Validation\Validator as v;
 
 class Asserts{
     /**
-     * @param $string
+     * @param $string string
+     * @param $errorMessage string
      * @throws Exception
      */
-    function userName($string){
+    function isString($string, $errorMessage){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 50)->validate($string);
+        $validation = v::stringType()->validate($string);
 
-        if(!$validateFirstName){
+        if(!$validation){
-            throw new Exception('The user name must be a string between 1 and 50 characters');
+            throw new Exception($errorMessage);
         }
     }
 
     /**
-     * @param $string
+     * @param $string string
+     * @param $errorMessage string
      * @throws Exception
      */
-    function password($string){
+    function isNotEmpty($string, $errorMessage){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 50)->validate($string);
+        $validation = v::notEmpty()->validate($string);
 
-        if(!$validateFirstName){
+        if(!$validation){
-            throw new Exception('The password must be a string between 1 and 50 characters');
+            throw new Exception($errorMessage);
         }
     }
 
     /**
-     * @param $string
+     * @param $string string
+     * @param $min integer
+     * @param $max integer
+     * @param $errorMessage string
      * @throws Exception
      */
-    function firstName($string){
+    function betweenLength($string, $min, $max, $errorMessage){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 100)->validate($string);
+        $validation = v::length($min, $max)->validate($string);
 
-        if(!$validateFirstName){
+        if(!$validation){
-            throw new Exception('The first name must be a string between 1 and 100 characters');
+            throw new Exception($errorMessage);
         }
     }
 
     /**
-     * @param $string
+     * @param $number integer
+     * @param $errorMessage string
      * @throws Exception
      */
-    function middleName($string){
+    function higherThanZero($number, $errorMessage){
-        if(!v::stringType()->notEmpty()->length(1, 100)->validate($string)){
+        if($number <= 0){
-            throw new Exception('The middle name must be a string between 1 and 100 characters');
+            throw new Exception($errorMessage);
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function birthDate($string){
-        if(!v::date('Y-m-d')->notEmpty()->validate($string)){
-            throw new Exception('The birth date must be in the yyyy-mm-dd format');
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function email($string){
-        if(!v::stringType()->notEmpty()->length(1, 100)->validate($string)){
-            throw new Exception('The email must be a string between 1 and 100 characters');
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function phone($string){
-        if(!v::digit()->notEmpty()->length(10, 10)->validate($string)){
-            throw new Exception('The phone must be a numeric value of 10 digits');
         }
     }
 }