update

Author: saadshams

Dockerfile

@@ -6,9 +6,8 @@ WORKDIR /service
 COPY package*.json ./
 COPY . .
 
-# DEVELOPMENT
+# DEVELOPMENT - Enable Volume in docker-compose.yml
 #ENV NODE_ENV development
-## Enable Volume in docker-compose.yml
 #RUN npm install
 #CMD ["npx", "nodemon", "npm", "start"]
 

src/model/ServiceProxy.js

@@ -46,7 +46,7 @@ export class ServiceProxy extends Proxy {
         try {
             await this.mySQL.beginTransaction(connection);
             const result = await this.user.add(connection, user);
-            if (user.roles)
+            if (user.roles && user.roles.length > 0)
                 await this.role.updateRolesById(connection, result.body.id, user.roles);
             await this.mySQL.commit(connection);
             return result;
@@ -65,7 +65,8 @@ export class ServiceProxy extends Proxy {
             const result = await this.user.update(connection, user);
             if (user.roles) {
                 await this.role.deleteRolesById(connection, user.id);
-                await this.role.updateRolesById(connection, user.id, user.roles)
+                if (user.roles.length > 0)
+                    await this.role.updateRolesById(connection, user.id, user.roles)
             }
             await this.mySQL.commit(connection);
             result.body = user;

src/model/data/Role.js

@@ -46,7 +46,7 @@ export class Role {
             let sql = "INSERT INTO user_role(user_id, role_id) VALUES ?;"
             let values = roles.map(({id, name}) => [userId, id]);
             connection.query(sql, [values], (error, result) => {
-                error ? reject({status: 500, body: error}) : resolve({status: 200, body: roles});
+                error ? reject({status: 500, body: error.sqlMessage}) : resolve({status: 200, body: roles});
             });
         });
     }