fix(salary) - fix file upload (#340)

* find salary fields dynamically from xlsx file
erxes · Mar 18, 2024 · 5256b1f · 5256b1f
1 parent 9bbafa5
commit 5256b1f
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 140 deletions.
diff --git a/packages/plugin-salary-api/src/configs.ts b/packages/plugin-salary-api/src/configs.ts
@@ -17,13 +17,13 @@ export default {
   permissions,
 
   meta: {
-    permissions,
+    permissions
   },
 
   graphql: async () => {
     return {
       typeDefs: await typeDefs(),
-      resolvers: await resolvers(),
+      resolvers: await resolvers()
     };
   },
 
@@ -34,7 +34,7 @@ export default {
     const requestInfo = {
       secure: req.secure,
       cookies: req.cookies,
-      headers: req.headers,
+      headers: req.headers
     };
 
     context.subdomain = subdomain;
@@ -52,7 +52,7 @@ export default {
 
     const corsOptions = {
       credentials: true,
-      origin: DOMAIN || 'http://localhost:3000',
+      origin: DOMAIN || 'http://localhost:3000'
     };
 
     app.use(cors(corsOptions));
@@ -80,9 +80,14 @@ export default {
           }
 
           try {
-            const result = await handleUpload(subdomain, req.user, file, title);
-
-            res.status(200).json({ success: true, result });
+            const message = await handleUpload(
+              subdomain,
+              req.user,
+              file,
+              title
+            );
+
+            res.status(200).json({ success: true, message });
           } catch (e) {
             return res.status(200).json({ error: e.message });
           }
@@ -91,8 +96,8 @@ export default {
           // next(e);
           return res.status(200).json({ error: e.message });
         }
-      },
+      }
     );
   },
-  setupMessageConsumers,
+  setupMessageConsumers
 };
diff --git a/packages/plugin-salary-api/src/constants.ts b/packages/plugin-salary-api/src/constants.ts
@@ -13,5 +13,23 @@ export const SALARY_FIELDS = [
   'hhoat',
   'otherDeduction',
   'preliminarySalary',
-  'endSalary',
+  'endSalary'
 ];
+
+export const SALARY_FIELDS_MAP = {
+  'ажилтны код': 'employeeId',
+  'ажиллавал зохих цаг': 'totalWorkHours',
+  'ажилласан цаг': 'totalWorkedHours',
+  'үндсэн цалин': 'mainSalary',
+  'олговол зохих цалин': 'adequateSalary',
+  'ээлжийн амралт': 'vacation',
+  'нийт нэмэгдэл': 'totalAddition',
+  'сарын kpi': 'kpi',
+  'бусад нэмэгдэл': 'otherAddition',
+  'бусад суутгал': 'otherDeduction',
+  'нийт суутгал': 'mainDeduction',
+  ндш: 'ndsh',
+  ххоат: 'hhoat',
+  'урьдчилгаа цалин': 'preliminarySalary',
+  'сарын сүүл цалин': 'endSalary'
+};
diff --git a/packages/plugin-salary-api/src/graphql/resolvers/queries.ts b/packages/plugin-salary-api/src/graphql/resolvers/queries.ts
@@ -9,8 +9,6 @@ const salaryQueries = {
   async salaryReport(_root, args: any, { models }: IContext) {
     const { page = 1, perPage = 20, employeeId } = args;
 
-    console.log('ajajjajaj');
-
     const qry: any = {};
 
     if (employeeId) {
@@ -26,18 +24,18 @@ const salaryQueries = {
   async salaryByEmployee(
     _root,
     args: { password: string; page: number; perPage: number },
-    { models, user, subdomain }: IContext,
+    { models, user, subdomain }: IContext
   ) {
     const { password, page = 1, perPage = 20 } = args;
     const employee = await sendCommonMessage({
       subdomain,
       serviceName: 'core',
       action: 'users.findOne',
       data: {
-        _id: user._id,
+        _id: user._id
       },
       isRPC: true,
-      defaultValue: null,
+      defaultValue: null
     });
 
     const checkPassword = await sendCommonMessage({
@@ -46,10 +44,10 @@ const salaryQueries = {
       action: 'users.comparePassword',
       data: {
         password,
-        userPassword: employee.password,
+        userPassword: employee.password
       },
       isRPC: true,
-      defaultValue: false,
+      defaultValue: false
     });
 
     if (!checkPassword) {
@@ -58,11 +56,11 @@ const salaryQueries = {
 
     const list = await paginate(
       models.Salaries.find({ employeeId: employee.employeeId }),
-      { page, perPage },
+      { page, perPage }
     );
 
     const totalCount = await models.Salaries.find({
-      employeeId: employee.employeeId,
+      employeeId: employee.employeeId
     }).countDocuments();
 
     return { list, totalCount };
@@ -72,7 +70,7 @@ const salaryQueries = {
     const labels: any = {};
     const exclude = ['createdAt', 'createdBy'];
 
-    Object.keys(salarySchema.paths).forEach((path) => {
+    Object.keys(salarySchema.paths).forEach(path => {
       if (
         salarySchema.paths[path].options.label === undefined ||
         exclude.includes(path)
@@ -89,7 +87,7 @@ const salaryQueries = {
     const symbmols: any = {};
     const exclude = ['createdAt', 'createdBy'];
 
-    Object.keys(salarySchema.paths).forEach((path) => {
+    Object.keys(salarySchema.paths).forEach(path => {
       if (
         salarySchema.paths[path].options.symbol === undefined ||
         exclude.includes(path)
@@ -100,12 +98,12 @@ const salaryQueries = {
     });
 
     return symbmols;
-  },
+  }
 };
 
-// requireLogin(salaryQueries, 'salaryReport');
-// requireLogin(salaryQueries, 'salaryByEmployee');
+requireLogin(salaryQueries, 'salaryReport');
+requireLogin(salaryQueries, 'salaryByEmployee');
 
-// checkPermission(salaryQueries, 'salaryReport', 'showSalaries', []);
+checkPermission(salaryQueries, 'salaryReport', 'showSalaries', []);
 
 export default salaryQueries;