Compare commits

..

14 Commits

Author SHA1 Message Date
663ea7cc3e [add] Testing the docker build in CI 2018-08-08 07:41:29 +00:00
f93b41f14e [add] Index protection 2018-08-08 07:37:27 +00:00
24f1ce1ed7 [add] Docker ignore for php 2018-08-08 07:32:54 +00:00
b25346e3d5 [add] Database initiated along with container 2018-08-08 07:14:22 +00:00
f2237d9209 [add] Connecting to mysql from pdo 2018-08-08 05:24:02 +00:00
7fc9ca8c75 [add] Mysql container 2018-08-07 19:25:20 -06:00
97fca1d7d3 [add] Docker compose 2018-08-07 17:33:21 -06:00
058e19a49a [add] Apache conf for the docker container 2018-08-07 17:32:32 -06:00
bffeb6e9f4 [add] Dockerfile 2018-08-07 17:31:02 -06:00
9a3e876afe Merge pull request #9 from PootisPenserHere/employeeDataByCode
[add] Emṕloyee data by code
2018-08-06 15:22:05 -06:00
dadea504d0 [add] Emṕloyee data by code 2018-08-06 15:17:31 -06:00
1390427ec0 Merge pull request #8 from PootisPenserHere/listAllEmployees
[add] List of all active employees
2018-08-06 03:51:09 -06:00
6c4e42e337 [add] List of all active employees 2018-08-06 03:49:42 -06:00
f4d1ce1ab7 Merge pull request #7 from PootisPenserHere/updatingEmployeeData
Updating employee data
2018-08-06 03:35:09 -06:00
11 changed files with 162 additions and 4 deletions

View File

@@ -0,0 +1,5 @@
Dockerfile
README.md
buildspec.yml
CONTRIBUTING.md
docker-compose.yml

1
api-payroll/.htaccess Normal file
View File

@@ -0,0 +1 @@
Options -Indexes

43
api-payroll/Dockerfile Normal file
View File

@@ -0,0 +1,43 @@
FROM ubuntu:16.04
# Updating
RUN apt-get -y update && apt-get -y upgrade
# Installing php, apache and supplementary software
RUN apt-get -y install apache2 php7.0 libapache2-mod-php7.0 php7.0-cli php7.0-common php7.0-mbstring php7.0-gd php7.0-intl php7.0-xml php7.0-mysql php7.0-mcrypt php7.0-zip curl git unzip composer
# Enable apache mods
RUN a2enmod php7.0
RUN a2enmod rewrite
# Update the PHP.ini file, enable <? ?> tags and quieten logging
RUN sed -i "s/short_open_tag = Off/short_open_tag = On/" /etc/php/7.0/apache2/php.ini
RUN sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PARSE/" /etc/php/7.0/apache2/php.ini
# Manually set up the apache environment variables
ENV APACHE_RUN_USER www-data
ENV APACHE_RUN_GROUP www-data
ENV APACHE_LOG_DIR /var/log/apache2
ENV APACHE_LOCK_DIR /var/lock/apache2
# Expose apache
EXPOSE 80
# Copy this repo into place.
ADD . /var/www/site
WORKDIR /var/www/site
# Testing permisions
RUN chmod 777 -R .
# Installing dependencies
RUN composer install
# Unit tests
RUN composer test
# Update the default apache site with the config we created.
ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
# By default start up apache in the foreground, override with /bin/bash for interative
CMD /usr/sbin/apache2ctl -D FOREGROUND

View File

@@ -0,0 +1,15 @@
<VirtualHost *:80>
ServerAdmin me@mydomain.com
DocumentRoot /var/www/site
<Directory /var/www/site/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order deny,allow
Allow from all
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>

View File

@@ -14,8 +14,9 @@ phases:
- echo Entered the build phase...
- echo Build started on `date`
- composer test
- sudo docker-compose up --build -d
post_build:
commands:
- echo Entered the post_build phase...
- sudo docker-compose down --rmi all -v
- echo Build completed on `date`

View File

@@ -269,6 +269,16 @@ class EmployeeApplication{
return $response;
}
/**
* @param $code string
* @return array
*/
function getEmployeeDataByCode($code){
$idEmployee = $this->getIdEmployeeTypeByCode($code);
return $this->proxyGetEmployeeDataById($idEmployee);
}
/**
* @param $idPerson integer
* @param $firstName binary
@@ -404,5 +414,44 @@ class EmployeeApplication{
$this->pdo->rollback();
}
}
/**
* Intended for internal use
*
* This method will bring a list of ids of all the employees that are
* currently active in the system
*
* @return array
*/
function getIdEmployeeFromAllActiveEmployees(){
$stmt = $this->pdo->prepare("SELECT
id
FROM
employees
WHERE
status = 'ACTIVE';");
$stmt->execute();
$results = $stmt->fetchAll();
if(!$results){
exit($this->databaseSelectQueryErrorMessage);
}
$stmt = null;
return $results;
}
function listAllActiveEmployees(){
$ids = $this->getIdEmployeeFromAllActiveEmployees();
$result = array();
foreach($ids as $row){
$result[] = $this->proxyGetEmployeeDataById($row['id']);
}
return $result;
}
}
?>

View File

@@ -41,6 +41,12 @@ $app->get('/api/employee/types', function (Request $request, Response $response,
->write(json_encode($this->employeeApplication->listEmployeeTypes()));
});
$app->get('/api/employee/all', function (Request $request, Response $response, array $args) {
return $response->withStatus(200)
->withHeader('Content-Type', 'application/json')
->write(json_encode($this->employeeApplication->listAllActiveEmployees()));
});
$app->post('/api/employee', function ($request, $response) {
$requestData = $request->getParsedBody();
@@ -73,10 +79,18 @@ $app->get('/api/employee/type/{code}', function (Request $request, Response $res
->write(json_encode($this->employeeApplication->getIdEmployeeTypeByCode($code)));
});
$app->get('/api/employee/{idEmployee}', function (Request $request, Response $response, array $args) {
$app->get('/api/employee/id/{idEmployee}', function (Request $request, Response $response, array $args) {
$idEmployee = $args['idEmployee'];
return $response->withStatus(200)
->withHeader('Content-Type', 'application/json')
->write(json_encode($this->employeeApplication->proxyGetEmployeeDataById($idEmployee)));
});
$app->get('/api/employee/code/{code}', function (Request $request, Response $response, array $args) {
$code = $args['code'];
return $response->withStatus(200)
->withHeader('Content-Type', 'application/json')
->write(json_encode($this->employeeApplication->getEmployeeDataByCode($code)));
});

View File

@@ -26,7 +26,7 @@ return [
// Datanase settings
'mysql' => [
'host' => 'localhost',
'host' => 'mysql',
'database' => 'payroll',
'user' => 'root',
'password' => '12345678',
@@ -43,7 +43,7 @@ return [
// Employee settings
'employee' => [
'codeLength' => '5',
'codeLength' => '3',
],
],
];

1
database/.dockerignore Normal file
View File

@@ -0,0 +1 @@
Dockerfile

3
database/Dockerfile Normal file
View File

@@ -0,0 +1,3 @@
FROM mysql:5.7
ADD . /docker-entrypoint-initdb.d

26
docker-compose.yml Normal file
View File

@@ -0,0 +1,26 @@
version: '3'
services:
api:
container_name: payroll_api
build: api-payroll/
ports:
- "8085:80"
volumes:
- api-payroll:/var/www/site
depends_on:
- mysql
mysql:
container_name: payroll_mysql
restart: always
build: database
ports:
- "3306:3306"
volumes:
- my-datavolume:/var/lib/mysql
environment:
MYSQL_ROOT_PASSWORD: '12345678'
MYSQL_USER: 'sloth'
MYSQL_PASS: '12345678'
volumes:
api-payroll:
my-datavolume: