update

Author: saadshams

Dockerfile

@@ -7,13 +7,13 @@ COPY package*.json ./
 COPY . .
 
 # DEVELOPMENT - Enable Volume in docker-compose.yml
-#ENV NODE_ENV development
-#RUN npm install
-#CMD ["npx", "nodemon", "npm", "start"]
+ENV NODE_ENV development
+RUN npm install
+CMD ["npx", "nodemon", "npm", "start"]
 
 # PRODUCTION
-ENV NODE_ENV production
-RUN npm install --production
-RUN adduser --disabled-password myuser
-USER myuser
-CMD ["npm", "start"]
+#ENV NODE_ENV production
+#RUN npm install --production
+#RUN adduser --disabled-password myuser
+#USER myuser
+#CMD ["npm", "start"]

docker-compose.yml

@@ -7,8 +7,8 @@ services:
       dockerfile: Dockerfile
     env_file: .env
     restart: on-failure
-#    volumes:
-#      - ./:/service
+    volumes:
+      - ./:/service
     ports:
       - "443:443"
       - "80:80"

src/controller/StartupCommand.js

@@ -18,8 +18,8 @@ import {ServiceProxy} from "../model/ServiceProxy.js";
 import {ServiceMediator} from "../view/ServiceMediator.js";
 import {Service} from "../view/components/Service.js";
 import {MySQL} from "../model/connections/MySQL.js";
-import {User} from "../model/data/User.js";
-import {Role} from "../model/data/Role.js";
+import {UserData} from "../model/data/UserData.js";
+import {RoleData} from "../model/data/RoleData.js";
 
 export class StartupCommand extends SimpleCommand {
 
@@ -53,7 +53,7 @@ export class StartupCommand extends SimpleCommand {
         mySQL.tryConnecting()
             .then(() => {
                 this.facade.registerCommand(ApplicationFacade.SERVICE, () => new ServiceCommand());
-                this.facade.registerProxy(new ServiceProxy(mySQL, new User(), new Role()));
+                this.facade.registerProxy(new ServiceProxy(mySQL, new UserData(), new RoleData()));
                 this.facade.registerMediator(new ServiceMediator(new Service(options)));
             });
     }

src/model/ServiceProxy.js

@@ -12,17 +12,17 @@ export class ServiceProxy extends Proxy {
 
     static get NAME() { return "ServiceProxy" };
 
-    constructor(mySQL, user, role) {
+    constructor(mySQL, userData, roleData) {
         super(ServiceProxy.NAME, null);
         this.mySQL = mySQL;
-        this.user = user;
-        this.role = role;
+        this.userData = userData;
+        this.roleData = roleData;
     }
 
     async findAllUsers() {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.user.findAllUsers(connection);
+            return await this.userData.findAllUsers(connection);
         } catch (error) {
             throw error;
         } finally {
@@ -33,7 +33,7 @@ export class ServiceProxy extends Proxy {
     async findUserById(id) {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.user.findUserById(connection, id);
+            return await this.userData.findUserById(connection, id);
         } catch(error) {
             throw error;
         } finally {
@@ -45,9 +45,9 @@ export class ServiceProxy extends Proxy {
         const connection = await this.mySQL.getConnection();
         try {
             await this.mySQL.beginTransaction(connection);
-            const result = await this.user.add(connection, user);
+            const result = await this.userData.add(connection, user);
             if (user.roles && user.roles.length > 0)
-                await this.role.updateRolesById(connection, result.body.id, user.roles);
+                await this.roleData.updateRolesById(connection, result.body.id, user.roles);
             await this.mySQL.commit(connection);
             return result;
         } catch(error) {
@@ -62,11 +62,11 @@ export class ServiceProxy extends Proxy {
         const connection = await this.mySQL.getConnection();
         try {
             await this.mySQL.beginTransaction(connection);
-            const result = await this.user.update(connection, user);
+            const result = await this.userData.update(connection, user);
             if (user.roles) {
-                await this.role.deleteRolesById(connection, user.id);
+                await this.roleData.deleteRolesById(connection, user.id);
                 if (user.roles.length > 0)
-                    await this.role.updateRolesById(connection, user.id, user.roles)
+                    await this.roleData.updateRolesById(connection, user.id, user.roles)
             }
             await this.mySQL.commit(connection);
             result.body = user;
@@ -82,7 +82,7 @@ export class ServiceProxy extends Proxy {
     async deleteById(id) {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.user.deleteById(connection, id);
+            return await this.userData.deleteById(connection, id);
         } catch(error) {
             throw error;
         } finally {
@@ -93,7 +93,7 @@ export class ServiceProxy extends Proxy {
     async findAllDepartments() {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.user.findAllDepartments(connection);
+            return await this.userData.findAllDepartments(connection);
         } catch(error) {
             throw error;
         } finally {
@@ -104,7 +104,7 @@ export class ServiceProxy extends Proxy {
     async findAllRoles() {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.role.findAllRoles(connection);
+            return await this.roleData.findAllRoles(connection);
         } catch(error) {
             throw error;
         } finally {
@@ -115,7 +115,7 @@ export class ServiceProxy extends Proxy {
     async findRolesById(id) {
         const connection = await this.mySQL.getConnection();
         try {
-            return await this.role.findRolesById(connection, id);
+            return await this.roleData.findRolesById(connection, id);
         } catch(error) {
             throw error;
         } finally {
@@ -127,8 +127,8 @@ export class ServiceProxy extends Proxy {
         const connection = await this.mySQL.getConnection();
         try {
             await this.mySQL.beginTransaction(connection);
-            await this.role.deleteRolesById(connection, id);
-            const payload = await this.role.updateRolesById(connection, id, roles);
+            await this.roleData.deleteRolesById(connection, id);
+            const payload = await this.roleData.updateRolesById(connection, id, roles);
             await this.mySQL.commit(connection);
             return payload;
         } catch (error) {

src/model/data/Role.js renamed to src/model/data/RoleData.js

@@ -1,12 +1,12 @@
 //
-//  Role.js
+//  RoleData.js
 //  PureMVC JS Demo - EmployeeAdmin Microservice
 //
 //  Copyright(c) 2023 Saad Shams <[email protected]>
 //  Your reuse is governed by the Creative Commons Attribution 3.0 License
 //
 
-export class Role {
+export class RoleData {
 
     constructor() {}
 

src/model/data/User.js renamed to src/model/data/UserData.js

@@ -1,12 +1,12 @@
 //
-//  User.js
+//  UserData.js
 //  PureMVC JS Demo - EmployeeAdmin Microservice
 //
 //  Copyright(c) 2023 Saad Shams <[email protected]>
 //  Your reuse is governed by the Creative Commons Attribution 3.0 License
 //
 
-export class User {
+export class UserData {
 
     constructor() {}