From 2576ae5c08fddbbb42a68a36c6cc6cf500ca4e49 Mon Sep 17 00:00:00 2001
From: artur_fjodorov <artur.fodorov@gmail.com>
Date: Sun, 9 Sep 2018 22:50:25 +0300
Subject: [PATCH 1/2] bug fix backend refactoring

---
 .../components/projects/Project/Project.vue   |  2 +-
 .../projects/ProjectChange/ProjectChange.vue  | 25 ++++--
 client/src/store/modules/projects/actions.ts  | 18 +++--
 .../store/modules/projects/getter-types.ts    |  2 +
 client/src/store/modules/projects/getters.ts  |  5 +-
 client/src/store/modules/projects/index.ts    |  4 +-
 .../store/modules/projects/mutation-types.ts  |  2 +
 .../src/store/modules/projects/mutations.ts   |  5 +-
 .../store/modules/projects/project.service.ts |  4 +-
 server/features/project/project.controller.ts | 18 +++--
 server/features/project/project.service.ts    | 78 ++++++++++++-------
 server/features/project/project.validator.ts  |  2 +-
 12 files changed, 110 insertions(+), 55 deletions(-)

diff --git a/client/src/components/projects/Project/Project.vue b/client/src/components/projects/Project/Project.vue
index 2be2dc13..0b34429b 100644
--- a/client/src/components/projects/Project/Project.vue
+++ b/client/src/components/projects/Project/Project.vue
@@ -180,7 +180,7 @@
         this.modalVisible = false;
       },
       deleteProject() {
-        this.$store.dispatch(DELETE_PROJECT, this.project.uniqueId);
+        this.$store.dispatch(DELETE_PROJECT, this.project.id);
       },
       openWithFilter(key: string, value: string) {
         this.$router.push({name: Routes.Projects, query: {[key]: value.toString()}});
diff --git a/client/src/components/projects/ProjectChange/ProjectChange.vue b/client/src/components/projects/ProjectChange/ProjectChange.vue
index 6cd70c46..cfc4d39e 100644
--- a/client/src/components/projects/ProjectChange/ProjectChange.vue
+++ b/client/src/components/projects/ProjectChange/ProjectChange.vue
@@ -1,12 +1,20 @@
 <template>
   <CommonModal @exit="goBack">
-    <template slot="modal-title">{{ id ? 'Edit' : 'Create' }} project</template>
+    <template slot="modal-title">
+      {{ id ? 'Edit' : 'Create' }} project
+      <ErrorMessage v-if="errorMessage">
+        <p class="title is-size-18">
+          {{errorMessage}}
+        </p>
+      </ErrorMessage>
+    </template>
     <p
       class="manage-user-subtitle common-modal-subtitle has-text-centered is-size-5 is-size-6-mobile"
       slot="modal-subtitle">
       Please {{ id ? 'edit' : 'create' }} project information here
     </p>
     <template slot="modal-content">
+
       <div class="form-container project-change">
         <div class="field centered-margin">
           <Stepper
@@ -325,16 +333,16 @@
   } from '../../../store/modules/projects/action-types';
   import {FETCH_ROLES, FETCH_EMPLOYEES} from '../../../store/modules/employees/action-types';
   import {
-    ADDONS,
+    ADDONS, ERROR_MESSAGE,
     PROJECT_CUSTOMERS, PROJECT_DESCRIPTION, PROJECT_DOMAIN_ID, PROJECT_EMPLOYEES, PROJECT_END_DATE, PROJECT_IMAGE,
     PROJECT_NAME,
     PROJECT_PROGRAM_ID, PROJECT_PSS, PROJECT_SCHEDULES, PROJECT_START_DATE, PROJECT_TECHNOLOGIES, PROJECT_TYPE_ID
-  } from '../../../store/modules/projects/getter-types';
+  } from "../../../store/modules/projects/getter-types";
   import {ITechnology} from '../../../shared/interfaces/ITechnology';
   import {TECHNOLOGIES} from '../../../store/modules/technologies/getter-types';
   import {FETCH_TECHNOLOGIES} from '../../../store/modules/technologies/action-types';
   import {
-    INCREMENT_VERSION,
+    INCREMENT_VERSION, SET_ERROR_MESSAGE,
     SET_PROJECT,
     SET_PROJECT_CUSTOMERS,
     SET_PROJECT_DESCRIPTION,
@@ -347,7 +355,7 @@
     SET_PROJECT_START_DATE,
     SET_PROJECT_TECHNOLOGIES,
     SET_PROJECT_TYPE
-  } from '../../../store/modules/projects/mutation-types';
+  } from "../../../store/modules/projects/mutation-types";
   import {Util} from '../../../shared/classes/Util';
   import {Types} from '../../../store/modules/projects/constant-types';
   import {ICustomer} from '../../../shared/interfaces/ICustomer';
@@ -390,6 +398,9 @@
       }
     },
     computed: {
+      errorMessage(): string {
+        return this.$store.getters[ERROR_MESSAGE];
+      },
       name: Util.mapTwoWay<string>(PROJECT_NAME, SET_PROJECT_NAME),
       description: Util.mapTwoWay<string>(PROJECT_DESCRIPTION, SET_PROJECT_DESCRIPTION),
       pss: Util.mapTwoWay<number>(PROJECT_PSS, SET_PROJECT_PSS),
@@ -448,7 +459,7 @@
             if (name === '') return true;
 
             return this.id
-              ? !await this.$store.dispatch(CHECK_PROJECT_EXISTENCE_UPDATE, {name, id: this.id})
+              ? !await this.$store.dispatch(CHECK_PROJECT_EXISTENCE_UPDATE, name)
               : !await this.$store.dispatch(CHECK_PROJECT_EXISTENCE, name);
           }
         },
@@ -523,6 +534,7 @@
         }
       },
       goBack() {
+        this.$store.commit(SET_ERROR_MESSAGE, null);
         if (this.id) {
           this.$store.dispatch(UPDATE_PROJECT_IMAGE, {id: this.id, image: this.image});
           this.$router.push({name: Routes.Project, params: {id: this.id}});
@@ -541,6 +553,7 @@
         this.$store.dispatch(REMOVE_PROJECT_IMAGE, this.$store.getters[PROJECT_IMAGE]);
       },
       saveProject() {
+        this.$store.commit(SET_ERROR_MESSAGE, null);
         if (this.id) {
           this.$store.commit(INCREMENT_VERSION);
           this.$store.dispatch(EDIT_PROJECT);
diff --git a/client/src/store/modules/projects/actions.ts b/client/src/store/modules/projects/actions.ts
index 204000ba..552ad530 100644
--- a/client/src/store/modules/projects/actions.ts
+++ b/client/src/store/modules/projects/actions.ts
@@ -17,7 +17,7 @@ import {
 import {
   FINISH_LOADING, RESET_FILTERS, SET_COMPLETION_VALUE,
   SET_CUSTOMERS,
-  SET_DOMAINS,
+  SET_DOMAINS, SET_ERROR_MESSAGE,
   SET_FILTER_VALUE,
   SET_LINES,
   SET_PROGRAMS,
@@ -84,19 +84,23 @@ export const actions: ActionTree<IProjectState, {}> = {
       .then(response => response.data);
   },
 
-  [CHECK_PROJECT_EXISTENCE_UPDATE]({commit}, payload: {name:string, id:string}) {
-    return ProjectService.doesProjectWithIdExist(payload.name, payload.id)
+  [CHECK_PROJECT_EXISTENCE_UPDATE]({commit, state}, name: string) {
+    return ProjectService.doesProjectWithIdExist(name, state.project.uniqueId)
       .then(response => response.data);
   },
 
-  [CREATE_PROJECT]({state}) {
+  [CREATE_PROJECT]({state, commit}) {
     return ProjectService.createProject(state.project)
-      .then(() => router.push({name: Routes.Projects}));
+      .then(
+        () => router.push({name: Routes.Projects}),
+        error => {commit(SET_ERROR_MESSAGE, error.response.data.errors.latest.msg)});
   },
 
-  [EDIT_PROJECT]({state}) {
+  [EDIT_PROJECT]({state, commit}) {
     return ProjectService.editProject(state.project)
-      .then((response) => router.push({name: Routes.Project, params: { id: String(response.data.id) }}));
+      .then(
+        (response) => router.push({name: Routes.Project, params: { id: String(response.data.id) }}),
+        error => {commit(SET_ERROR_MESSAGE, error.response.data.errors.latest.msg)});
   },
 
   [DELETE_PROJECT]({commit}, id:string) {
diff --git a/client/src/store/modules/projects/getter-types.ts b/client/src/store/modules/projects/getter-types.ts
index b8ca0da1..278daddf 100644
--- a/client/src/store/modules/projects/getter-types.ts
+++ b/client/src/store/modules/projects/getter-types.ts
@@ -15,6 +15,8 @@ export const SORT = 'SORT';
 export const SORT_REVERSE = 'SORT_REVERSE';
 export const SORT_FIELD_NAME = 'SORT_FIELD_NAME';
 
+export const ERROR_MESSAGE = 'ERROR_MESSAGE';
+
 export const PROJECT_NAME = 'PROJECT_NAME';
 export const PROJECT_PROGRAM_ID = 'PROJECT_PROGRAM_ID';
 export const PROJECT_LINE = 'PROJECT_LINE';
diff --git a/client/src/store/modules/projects/getters.ts b/client/src/store/modules/projects/getters.ts
index 62021ea7..c7bd0222 100644
--- a/client/src/store/modules/projects/getters.ts
+++ b/client/src/store/modules/projects/getters.ts
@@ -27,7 +27,7 @@ import {
   PROJECT_DESCRIPTION,
   PROJECT_CUSTOMERS,
   PROJECT_SCHEDULES,
-  PROJECT_TECHNOLOGIES_GROUPED, PROJECT_PSS, COMPLETION, PROJECT_EMPLOYEES, PROJECT_IMAGE, FILTER_EMPTY
+  PROJECT_TECHNOLOGIES_GROUPED, PROJECT_PSS, COMPLETION, PROJECT_EMPLOYEES, PROJECT_IMAGE, FILTER_EMPTY, ERROR_MESSAGE
 } from './getter-types';
 import {TECHNOLOGIES} from '../technologies/getter-types';
 import {IProjectFilter, IProjectFilterCheck} from '../../../shared/interfaces/shared/IProjectFilter';
@@ -174,5 +174,6 @@ export const getters: GetterTree<IProjectState, {}> = {
   [PROJECT_SCHEDULES]: state => state.project.schedules,
   [PROJECT_TECHNOLOGIES]: state => state.project.technologies,
   [PROJECT_EMPLOYEES]: state => state.project.schedules.map(schedule => schedule.employee),
-  [PROJECT_IMAGE]: state => state.project.image
+  [PROJECT_IMAGE]: state => state.project.image,
+  [ERROR_MESSAGE]: state => state.errorMessage
 };
diff --git a/client/src/store/modules/projects/index.ts b/client/src/store/modules/projects/index.ts
index 82c636ef..853b740f 100644
--- a/client/src/store/modules/projects/index.ts
+++ b/client/src/store/modules/projects/index.ts
@@ -32,6 +32,7 @@ export interface IProjectState {
   sort: string;
   sortReverse: boolean;
   projectExists: boolean;
+  errorMessage: string;
 }
 
 
@@ -55,7 +56,8 @@ const projectState: Module<IProjectState, {}> = {
     autocompleteSearch: '',
     sort: 'name',
     sortReverse: true,
-    projectExists: false
+    projectExists: false,
+    errorMessage: ''
   },
   mutations,
   actions,
diff --git a/client/src/store/modules/projects/mutation-types.ts b/client/src/store/modules/projects/mutation-types.ts
index 9159d7ea..1dd0c69d 100644
--- a/client/src/store/modules/projects/mutation-types.ts
+++ b/client/src/store/modules/projects/mutation-types.ts
@@ -21,6 +21,8 @@ export const SET_SORT_REVERSE_VALUE = 'SET_SORT_REVERSE_VALUE';
 export const FINISH_LOADING = 'projects/FINISH_LOADING';
 export const INCREMENT_VERSION = 'projects/INCREMENT_VERSION';
 
+export const SET_ERROR_MESSAGE = 'projects/SET_ERROR_MESSAGE';
+
 export const SET_PROJECT_NAME = 'SET_PROJECT_NAME';
 export const SET_PROJECT_PROGRAM = 'SET_PROJECT_PROGRAM';
 export const SET_SCHEDULE = 'SET_SCHEDULE';
diff --git a/client/src/store/modules/projects/mutations.ts b/client/src/store/modules/projects/mutations.ts
index ef5314c4..f7fe31d1 100644
--- a/client/src/store/modules/projects/mutations.ts
+++ b/client/src/store/modules/projects/mutations.ts
@@ -42,7 +42,7 @@ import {
   SET_SORT_VALUE,
   SET_SORT_REVERSE_VALUE,
   RESET_FILTERS,
-  SET_PROJECT_IMAGE, SET_SCHEDULE, INCREMENT_VERSION
+  SET_PROJECT_IMAGE, SET_SCHEDULE, INCREMENT_VERSION, SET_ERROR_MESSAGE
 
 } from './mutation-types';
 
@@ -268,6 +268,9 @@ export const mutations: MutationTree<IProjectState> = {
   [REMOVE_PROJECT_SCHEDULE](state, targetId: string) {
     state.project.schedules = state.project.schedules.filter(schedule => schedule.employee.id !== targetId);
   },
+  [SET_ERROR_MESSAGE](state, payload: string) {
+    state.errorMessage = payload;
+  },
   [RESET_FILTERS](state) {
     state.filter = {};
     state.search = '';
diff --git a/client/src/store/modules/projects/project.service.ts b/client/src/store/modules/projects/project.service.ts
index 2bb5b49e..86d6932a 100644
--- a/client/src/store/modules/projects/project.service.ts
+++ b/client/src/store/modules/projects/project.service.ts
@@ -9,8 +9,8 @@ export class ProjectService {
     return axios.get<Boolean>(`${routes.DOES_PROJECT_EXIST}${name}`);
   }
 
-  static doesProjectWithIdExist(name: string = '', id:string) {
-    return axios.get<Boolean>(`${routes.DOES_PROJECT_EXIST_WITH_ID}${name}/${id}`);
+  static doesProjectWithIdExist(name: string = '', uniqueId:string) {
+    return axios.get<Boolean>(`${routes.DOES_PROJECT_EXIST_WITH_ID}${name}/${uniqueId}`);
   }
 
   static getProjects() {
diff --git a/server/features/project/project.controller.ts b/server/features/project/project.controller.ts
index 41b80c59..95fa8b62 100644
--- a/server/features/project/project.controller.ts
+++ b/server/features/project/project.controller.ts
@@ -12,6 +12,10 @@ router.get('/projects', (req, res) =>
   projectService.getProjects()
     .then(Util.handleData(res)));
 
+router.get('/projects/grouped', (req, res) =>
+  projectService.getGroupedProjects()
+    .then(Util.handleData(res)));
+
 router.get('/projects/addons', (req, res) =>
   projectAddonsService.getProjectFilterModel()
     .then(Util.handleData(res)));
@@ -28,8 +32,8 @@ router.get('/projects/exists/:name', (req, res) =>
   projectService.doesProjectWithNameExist(req.params.name)
     .then(doesExist => res.status(200).send(doesExist)));
 
-router.get('/projects/update/exists/:name/:id', (req, res) =>
-  projectService.doesProjectWithNameAndIdExist(req.params.name, req.params.id)
+router.get('/projects/update/exists/:name/:uniqueId', (req, res) =>
+  projectService.doesProjectWithNameAndIdExist(req.params.name, req.params.uniqueId)
     .then(doesExist => res.status(200).send(doesExist)));
 
 // POST Requests
@@ -37,17 +41,17 @@ router.post('/projects/create', projectValidator.createValidators(), (req, res)
   Util.handleValidation(req, res, () =>
     projectService.doesProjectWithNameExist(req.body.name).then(doesExist =>
       doesExist ?
-        Util.handleConflict(res, 'Project already exists or was archieved') :
+        Util.handleConflict(res, 'Project already exists') :
         projectService.createProject(req.body)
           .then(Util.handleData(res)))
   ));
 
 router.post('/projects/update', projectValidator.createValidators(), (req, res) =>
   Util.handleValidation(req, res, () =>
-    projectService.isProjectLatest(req.body.id).then(isLatest =>
+    projectService.isProjectLatest(req.body.id, req.body.uniqueId).then(isLatest =>
       !isLatest ?
         Util.handleConflict(res, 'Somebody has already updated the project in background') :
-        projectService.updateProject(req.body)
+        projectService.createProject(req.body)
           .then(Util.handleData(res)))
   ));
 
@@ -67,9 +71,9 @@ router.put('/projects/update/image', (req, res) =>
   )
 
 
-router.delete('/projects/delete/:uniqueId', projectValidator.deleteValidators(), (req, res) =>
+router.delete('/projects/delete/:id', projectValidator.deleteValidators(), (req, res) =>
   Util.handleValidation(req, res, () =>
-    projectService.deleteProject(req.params.uniqueId)
+    projectService.deleteProject(req.params.id)
       .then(() => res.status(200).json({message: 'ok'}))
   ));
 
diff --git a/server/features/project/project.service.ts b/server/features/project/project.service.ts
index cfd5bd6e..6975dc6a 100644
--- a/server/features/project/project.service.ts
+++ b/server/features/project/project.service.ts
@@ -8,17 +8,34 @@ import Guid from '../../shared/Guid';
 
 const projectService = {
 
-  getProjects: () => Project.scope([
-    Scopes.PROJECT_LIST,
-    Scopes.ACTUAL_PROJECTS
-  ])
-    .findAll({ order: [ ['updatedAt', 'DESC']]
-  }),
+  // getGroupedProjects: async () =>  {
+  //   const groupedProjects = await Project.findAll({
+  //     raw: true,
+  //     attributes: ['Project.uniqueId', [sequelize.fn('max', sequelize.col('Project.updatedAt')),'updatedAt']],
+  //     group: ['Project.uniqueId']
+  //   });
+  //
+  //
+  //
+  //   return p;
+  // },
+
+  getProjects: () => sequelize.query('SELECT id from "Projects" as pr' +
+    '  inner join (' +
+    '      Select "uniqueId", max("updatedAt") as maxDate' +
+    '      from "Projects"' +
+    '      group by "uniqueId"' +
+    '    ) as innerP' +
+    '    on pr."uniqueId" = innerP."uniqueId"' +
+    '    AND pr."updatedAt" = innerP.maxDate', { type: sequelize.QueryTypes.SELECT})
+    .then(maxDateProjects => Project.scope([Scopes.PROJECT_LIST ])
+      .findAll({
+        where: {id: maxDateProjects.map(project => project.id)}
+      })),
 
   // GET single project by id
   getProject: id => Project.scope([
-    Scopes.FULL,
-    Scopes.ACTUAL_PROJECTS
+    Scopes.FULL
   ])
     .findOne({
       where: {
@@ -43,14 +60,16 @@ const projectService = {
       console.log(error);
     }),
 
-  doesProjectWithNameExist: name => Project.count({where: {name: name, ishistory: false }})
+  doesProjectWithNameExist: name => Project.count({where: {name: name }})
     .then(count => count !== 0)
     .catch(error => {
       console.log(error);
     }),
 
-  doesProjectWithNameAndIdExist: (name, id) => Project.count({
-      where: {name: name, ishistory: false, id: {[sequelize.Op.ne]: id}
+  doesProjectWithNameAndIdExist: (name, uniqueId) => Project.count({
+      where: {
+        name: name,
+        uniqueId: {[sequelize.Op.ne]: uniqueId}
     }})
     .then(count => count !== 0)
     .catch(error => {
@@ -58,14 +77,19 @@ const projectService = {
     }),
 
 // GET Get latest project
-  isProjectLatest: id => Project.findOne({
-    where: {
-      id: id
-    }
-  }).then(project => !project.ishistory)
-    .catch(error => {
-      console.log(error);
-    }),
+  isProjectLatest: async (id, uniqueId) => {
+    const maxDate = await Project.max('updatedAt', {where: {uniqueId}});
+    const maxProject = await Project.findOne({
+      where: {
+        uniqueId,
+        updatedAt: maxDate
+      }
+    });
+
+
+    return maxProject.id === id;
+  },
+
 
   // POST create new project
   createProject: project => Project.create({
@@ -128,15 +152,15 @@ const projectService = {
     }
   },
 
-  deleteProject: async uniqueId => {
+  deleteProject: async id => {
     try {
-      const projects = await projectService.getProjectsByUniqueId(uniqueId);
-      projects.forEach(project => {
-        project.$remove('technologies', project.technologies);
-        Schedule.destroy({where: {projectId: project.id}});
-        ProjectCustomer.destroy({where: {projectId: project.id}});
-      });
-      return await Project.destroy({where: {uniqueId: uniqueId}, cascade: true});
+      const project = await projectService.getProject(id);
+
+      project.$remove('technologies', project.technologies);
+      Schedule.destroy({where: {projectId: project.id}});
+      ProjectCustomer.destroy({where: {projectId: project.id}});
+
+      return await Project.destroy({where: {id}, cascade: true});
     } catch (error) {
       throw new Error(error);
     }
diff --git a/server/features/project/project.validator.ts b/server/features/project/project.validator.ts
index 4ded1584..a102cbf0 100644
--- a/server/features/project/project.validator.ts
+++ b/server/features/project/project.validator.ts
@@ -16,7 +16,7 @@ const projectValidator = {
     ],
 
   deleteValidators: () => [
-    check('uniqueId', 'Project uniqueId is required').exists().isLength({min: 1, max: 100000})
+    check('id', 'Project id is required').exists().isLength({min: 1, max: 100000})
   ]
 };
 

From 95c7ae2f2d68e01e8ab385a2652401bf45c97b1d Mon Sep 17 00:00:00 2001
From: artur_fjodorov <artur.fodorov@gmail.com>
Date: Sun, 9 Sep 2018 22:51:10 +0300
Subject: [PATCH 2/2] bug fix

---
 server/features/project/project.controller.ts |  3 ---
 server/features/project/project.service.ts    | 14 +-------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/server/features/project/project.controller.ts b/server/features/project/project.controller.ts
index 95fa8b62..5aeed4d8 100644
--- a/server/features/project/project.controller.ts
+++ b/server/features/project/project.controller.ts
@@ -12,9 +12,6 @@ router.get('/projects', (req, res) =>
   projectService.getProjects()
     .then(Util.handleData(res)));
 
-router.get('/projects/grouped', (req, res) =>
-  projectService.getGroupedProjects()
-    .then(Util.handleData(res)));
 
 router.get('/projects/addons', (req, res) =>
   projectAddonsService.getProjectFilterModel()
diff --git a/server/features/project/project.service.ts b/server/features/project/project.service.ts
index 6975dc6a..b79dee8f 100644
--- a/server/features/project/project.service.ts
+++ b/server/features/project/project.service.ts
@@ -7,19 +7,7 @@ import {ProjectCustomer} from '../../models/ProjectCustomer';
 import Guid from '../../shared/Guid';
 
 const projectService = {
-
-  // getGroupedProjects: async () =>  {
-  //   const groupedProjects = await Project.findAll({
-  //     raw: true,
-  //     attributes: ['Project.uniqueId', [sequelize.fn('max', sequelize.col('Project.updatedAt')),'updatedAt']],
-  //     group: ['Project.uniqueId']
-  //   });
-  //
-  //
-  //
-  //   return p;
-  // },
-
+  
   getProjects: () => sequelize.query('SELECT id from "Projects" as pr' +
     '  inner join (' +
     '      Select "uniqueId", max("updatedAt") as maxDate' +