npm - @things-factory/operato-pms - Versions diffs - 9.0.0-beta.9 → 9.0.1 - Mend

@things-factory/operato-pms 9.0.0-beta.9 → 9.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (116) hide show

package/dist-server/graphql/resolvers/daily-loading/update-daily-loading.js CHANGED Viewed

@@ -38,27 +38,37 @@ exports.updateDailyLoading = {
     }
 };
 async function updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingDetailPatches, user, tx) {
-    const truckRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Truck)) || (0, shell_1.getRepository)(entities_1.Truck);
-    const blockRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Block)) || (0, shell_1.getRepository)(entities_1.Block);
-    const rampRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Ramp)) || (0, shell_1.getRepository)(entities_1.Ramp);
-    const dailyLoadingDetailRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.DailyLoadingDetail)) || (0, shell_1.getRepository)(entities_1.DailyLoadingDetail);
+    const truckRepo = tx?.getRepository(entities_1.Truck) || (0, shell_1.getRepository)(entities_1.Truck);
+    const blockRepo = tx?.getRepository(entities_1.Block) || (0, shell_1.getRepository)(entities_1.Block);
+    const rampRepo = tx?.getRepository(entities_1.Ramp) || (0, shell_1.getRepository)(entities_1.Ramp);
+    const dailyLoadingDetailRepo = tx?.getRepository(entities_1.DailyLoadingDetail) || (0, shell_1.getRepository)(entities_1.DailyLoadingDetail);
     let updatedDailyLoadingDetails = [];
     const dailyLoadingDetails = dailyLoading.dailyLoadingDetails;
     // for existing data row
     const existingDailyLoadingDetails = dailyLoadingDetailPatches.filter(detail => detail.name !== null);
     // new row added in client side
     const newDailyLoadingDetail = dailyLoadingDetailPatches.filter(detail => detail.name === null);
-    if ((existingDailyLoadingDetails === null || existingDailyLoadingDetails === void 0 ? void 0 : existingDailyLoadingDetails.length) > 0) {
+    if (existingDailyLoadingDetails?.length > 0) {
         updatedDailyLoadingDetails = await Promise.all(dailyLoadingDetails.map(async (existingRecord) => {
             const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(detail => detail.name === existingRecord.name);
             if (foundDailyLoadingDetailPatch.totalBunchWeight !== existingRecord.totalBunchWeight) {
                 await updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx);
             }
-            return Object.assign(Object.assign({}, existingRecord), { dailyLoading, truck: await truckRepo.findOneBy({ id: existingRecord.truck.id }), block: await blockRepo.findOneBy({ id: existingRecord.block.id }), ramp: await rampRepo.findOneBy({ id: existingRecord.ramp.id }), totalBunchLoaded: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchLoaded) || 0, totalBunchWeight: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchWeight) || 0, remark: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.remark) || null, updater: user });
+            return {
+                ...existingRecord,
+                dailyLoading,
+                truck: await truckRepo.findOneBy({ id: existingRecord.truck.id }),
+                block: await blockRepo.findOneBy({ id: existingRecord.block.id }),
+                ramp: await rampRepo.findOneBy({ id: existingRecord.ramp.id }),
+                totalBunchLoaded: foundDailyLoadingDetailPatch?.totalBunchLoaded || 0,
+                totalBunchWeight: foundDailyLoadingDetailPatch?.totalBunchWeight || 0,
+                remark: foundDailyLoadingDetailPatch?.remark || null,
+                updater: user
+            };
         }));
         updatedDailyLoadingDetails = await dailyLoadingDetailRepo.save(updatedDailyLoadingDetails);
     }
-    if ((newDailyLoadingDetail === null || newDailyLoadingDetail === void 0 ? void 0 : newDailyLoadingDetail.length) > 0) {
+    if (newDailyLoadingDetail?.length > 0) {
         await Promise.all(newDailyLoadingDetail.map(async (dailyLoadingDetail) => {
             let newDailyLoadingDetail = new entities_1.DailyLoadingDetail();
             newDailyLoadingDetail.domain = domain;
@@ -66,9 +76,9 @@ async function updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingDetail
             newDailyLoadingDetail.truck = await truckRepo.findOneBy({ id: dailyLoadingDetail.truck.id });
             newDailyLoadingDetail.block = await blockRepo.findOneBy({ id: dailyLoadingDetail.block.id });
             newDailyLoadingDetail.ramp = await rampRepo.findOneBy({ id: dailyLoadingDetail.ramp.id });
-            newDailyLoadingDetail.totalBunchLoaded = (dailyLoadingDetail === null || dailyLoadingDetail === void 0 ? void 0 : dailyLoadingDetail.totalBunchLoaded) || 0;
-            newDailyLoadingDetail.totalBunchWeight = (dailyLoadingDetail === null || dailyLoadingDetail === void 0 ? void 0 : dailyLoadingDetail.totalBunchWeight) || 0;
-            newDailyLoadingDetail.remark = (dailyLoadingDetail === null || dailyLoadingDetail === void 0 ? void 0 : dailyLoadingDetail.remark) || null;
+            newDailyLoadingDetail.totalBunchLoaded = dailyLoadingDetail?.totalBunchLoaded || 0;
+            newDailyLoadingDetail.totalBunchWeight = dailyLoadingDetail?.totalBunchWeight || 0;
+            newDailyLoadingDetail.remark = dailyLoadingDetail?.remark || null;
             newDailyLoadingDetail.creator = user;
             newDailyLoadingDetail.dailyLoading = dailyLoading;
             await dailyLoadingDetailRepo.save(newDailyLoadingDetail);
@@ -76,7 +86,7 @@ async function updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingDetail
     }
 }
 async function updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx) {
-    const plantationInvRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.PlantationInventory)) || (0, shell_1.getRepository)(entities_1.PlantationInventory);
+    const plantationInvRepo = tx?.getRepository(entities_1.PlantationInventory) || (0, shell_1.getRepository)(entities_1.PlantationInventory);
     let existingRampTonnage = await plantationInvRepo.findOne({
         where: { domain: { id: domain.id }, type: constants_1.INVENTORY_TYPE.RAMP_TONNAGE, ramp: { id: existingRecord.ramp.id } },
         relations: ['domain', 'block', 'ramp']

package/dist-server/graphql/resolvers/daily-loading/update-daily-loading.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-daily-loading.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/update-daily-loading.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, Repository } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { INVENTORY_TYPE, TRANSACTION_TYPE } from '../../../constants'\nimport { Block, DailyLoading, DailyLoadingDetail, PlantationInventory, Ramp, Truck } from '../../../entities'\nimport { generateTransactionHistory, NoGenerator } from '../../../utils'\n\nexport const updateDailyLoading = {\n async updateDailyLoading(_: any, { name, dailyLoadingPatch }, context: ResolverContext) {\n const { domain, user, tx } = context.state\n const dailyLoadingRepo = tx.getRepository(DailyLoading)\n\n let dailyLoading: DailyLoading = await dailyLoadingRepo.findOne({\n where: { name },\n relations: [\n 'dailyLoadingDetails',\n 'dailyLoadingDetails.truck',\n 'dailyLoadingDetails.ramp',\n 'dailyLoadingDetails.block'\n ]\n })\n\n // get sum of bunch loaded from all trip\n var totalBunch: number = dailyLoadingPatch.dailyLoadingDetails.reduce(function (prev, cur) {\n return prev + cur.totalBunchLoaded\n }, 0)\n\n var totalWeight: number = dailyLoadingPatch.dailyLoadingDetails.reduce(function (prev, cur) {\n return prev + cur.totalBunchWeight\n }, 0)\n\n dailyLoading.totalBunch = totalBunch\n dailyLoading.totalWeight = totalWeight\n dailyLoading.loadingDate = dailyLoadingPatch.loadingDate\n dailyLoading.updater = user\n dailyLoading = await dailyLoadingRepo.save(dailyLoading)\n\n // 2. Create daily loading detail\n await updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingPatch.dailyLoadingDetails, user, tx)\n\n return dailyLoading\n }\n}\n\nexport async function updateDailyLoadingDetail(\n domain: Domain,\n dailyLoading: DailyLoading,\n dailyLoadingDetailPatches: any[],\n user: User,\n tx?: EntityManager\n): Promise<void> {\n const truckRepo: Repository<Truck> = tx?.getRepository(Truck) \|\| getRepository(Truck)\n const blockRepo: Repository<Block> = tx?.getRepository(Block) \|\| getRepository(Block)\n const rampRepo: Repository<Ramp> = tx?.getRepository(Ramp) \|\| getRepository(Ramp)\n const dailyLoadingDetailRepo: Repository<DailyLoadingDetail> =\n tx?.getRepository(DailyLoadingDetail) \|\| getRepository(DailyLoadingDetail)\n\n let updatedDailyLoadingDetails: any[] = []\n const dailyLoadingDetails: DailyLoadingDetail[] = dailyLoading.dailyLoadingDetails\n // for existing data row\n const existingDailyLoadingDetails: DailyLoadingDetail[] = dailyLoadingDetailPatches.filter(\n detail => detail.name !== null\n )\n\n // new row added in client side\n const newDailyLoadingDetail: DailyLoadingDetail[] = dailyLoadingDetailPatches.filter(detail => detail.name === null)\n\n if (existingDailyLoadingDetails?.length > 0) {\n updatedDailyLoadingDetails = await Promise.all(\n dailyLoadingDetails.map(async (existingRecord: DailyLoadingDetail) => {\n const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(\n detail => detail.name === existingRecord.name\n )\n\n if (foundDailyLoadingDetailPatch.totalBunchWeight !== existingRecord.totalBunchWeight) {\n await updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx)\n }\n\n return {\n ...existingRecord,\n dailyLoading,\n truck: await truckRepo.findOneBy({ id: existingRecord.truck.id }),\n block: await blockRepo.findOneBy({ id: existingRecord.block.id }),\n ramp: await rampRepo.findOneBy({ id: existingRecord.ramp.id }),\n totalBunchLoaded: foundDailyLoadingDetailPatch?.totalBunchLoaded \|\| 0,\n totalBunchWeight: foundDailyLoadingDetailPatch?.totalBunchWeight \|\| 0,\n remark: foundDailyLoadingDetailPatch?.remark \|\| null,\n updater: user\n }\n })\n )\n updatedDailyLoadingDetails = await dailyLoadingDetailRepo.save(updatedDailyLoadingDetails)\n }\n\n if (newDailyLoadingDetail?.length > 0) {\n await Promise.all(\n newDailyLoadingDetail.map(async (dailyLoadingDetail: DailyLoadingDetail) => {\n let newDailyLoadingDetail: DailyLoadingDetail = new DailyLoadingDetail()\n newDailyLoadingDetail.domain = domain\n newDailyLoadingDetail.name = NoGenerator.dailyLoadingDetail()\n newDailyLoadingDetail.truck = await truckRepo.findOneBy({ id: dailyLoadingDetail.truck.id })\n newDailyLoadingDetail.block = await blockRepo.findOneBy({ id: dailyLoadingDetail.block.id })\n newDailyLoadingDetail.ramp = await rampRepo.findOneBy({ id: dailyLoadingDetail.ramp.id })\n newDailyLoadingDetail.totalBunchLoaded = dailyLoadingDetail?.totalBunchLoaded \|\| 0\n newDailyLoadingDetail.totalBunchWeight = dailyLoadingDetail?.totalBunchWeight \|\| 0\n newDailyLoadingDetail.remark = dailyLoadingDetail?.remark \|\| null\n newDailyLoadingDetail.creator = user\n newDailyLoadingDetail.dailyLoading = dailyLoading\n\n await dailyLoadingDetailRepo.save(newDailyLoadingDetail)\n })\n )\n }\n}\n\nexport async function updatePlantationInventory(\n domain: Domain,\n dailyLoading: DailyLoading,\n foundDailyLoadingDetailPatch: any,\n existingRecord: DailyLoadingDetail,\n user: User,\n tx?: EntityManager\n): Promise<void> {\n const plantationInvRepo: Repository<PlantationInventory> =\n tx?.getRepository(PlantationInventory) \|\| getRepository(PlantationInventory)\n\n let existingRampTonnage: PlantationInventory = await plantationInvRepo.findOne({\n where: { domain: { id: domain.id }, type: INVENTORY_TYPE.RAMP_TONNAGE, ramp: { id: existingRecord.ramp.id } },\n relations: ['domain', 'block', 'ramp']\n })\n\n if (existingRampTonnage) {\n const tonnageChanges: number = foundDailyLoadingDetailPatch.totalBunchWeight - existingRecord.totalBunchWeight\n existingRampTonnage.totalTonnage = existingRampTonnage.totalTonnage + tonnageChanges\n existingRampTonnage.updater = user\n await plantationInvRepo.save(existingRampTonnage)\n\n await generateTransactionHistory(\n existingRampTonnage.block,\n domain,\n existingRampTonnage.ramp,\n dailyLoading.id,\n dailyLoading.name,\n TRANSACTION_TYPE.LOADING_ADJUSTMENT,\n dailyLoading.loadingDate,\n 0,\n tonnageChanges,\n user,\n tx\n )\n }\n}\n"]}
1	+ {"version":3,"file":"update-daily-loading.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/update-daily-loading.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, Repository } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { INVENTORY_TYPE, TRANSACTION_TYPE } from '../../../constants'\nimport { Block, DailyLoading, DailyLoadingDetail, PlantationInventory, Ramp, Truck } from '../../../entities'\nimport { generateTransactionHistory, NoGenerator } from '../../../utils'\n\nexport const updateDailyLoading = {\n async updateDailyLoading(_: any, { name, dailyLoadingPatch }, context: ResolverContext) {\n const { domain, user, tx } = context.state\n const dailyLoadingRepo = tx.getRepository(DailyLoading)\n\n let dailyLoading: DailyLoading = await dailyLoadingRepo.findOne({\n where: { name },\n relations: [\n 'dailyLoadingDetails',\n 'dailyLoadingDetails.truck',\n 'dailyLoadingDetails.ramp',\n 'dailyLoadingDetails.block'\n ]\n })\n\n // get sum of bunch loaded from all trip\n var totalBunch: number = dailyLoadingPatch.dailyLoadingDetails.reduce(function (prev, cur) {\n return prev + cur.totalBunchLoaded\n }, 0)\n\n var totalWeight: number = dailyLoadingPatch.dailyLoadingDetails.reduce(function (prev, cur) {\n return prev + cur.totalBunchWeight\n }, 0)\n\n dailyLoading.totalBunch = totalBunch\n dailyLoading.totalWeight = totalWeight\n dailyLoading.loadingDate = dailyLoadingPatch.loadingDate\n dailyLoading.updater = user\n dailyLoading = await dailyLoadingRepo.save(dailyLoading)\n\n // 2. Create daily loading detail\n await updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingPatch.dailyLoadingDetails, user, tx)\n\n return dailyLoading\n }\n}\n\nexport async function updateDailyLoadingDetail(\n domain: Domain,\n dailyLoading: DailyLoading,\n dailyLoadingDetailPatches: any[],\n user: User,\n tx?: EntityManager\n): Promise<void> {\n const truckRepo: Repository<Truck> = tx?.getRepository(Truck) \|\| getRepository(Truck)\n const blockRepo: Repository<Block> = tx?.getRepository(Block) \|\| getRepository(Block)\n const rampRepo: Repository<Ramp> = tx?.getRepository(Ramp) \|\| getRepository(Ramp)\n const dailyLoadingDetailRepo: Repository<DailyLoadingDetail> =\n tx?.getRepository(DailyLoadingDetail) \|\| getRepository(DailyLoadingDetail)\n\n let updatedDailyLoadingDetails: any[] = []\n const dailyLoadingDetails: DailyLoadingDetail[] = dailyLoading.dailyLoadingDetails\n // for existing data row\n const existingDailyLoadingDetails: DailyLoadingDetail[] = dailyLoadingDetailPatches.filter(\n detail => detail.name !== null\n )\n\n // new row added in client side\n const newDailyLoadingDetail: DailyLoadingDetail[] = dailyLoadingDetailPatches.filter(detail => detail.name === null)\n\n if (existingDailyLoadingDetails?.length > 0) {\n updatedDailyLoadingDetails = await Promise.all(\n dailyLoadingDetails.map(async (existingRecord: DailyLoadingDetail) => {\n const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(\n detail => detail.name === existingRecord.name\n )\n\n if (foundDailyLoadingDetailPatch.totalBunchWeight !== existingRecord.totalBunchWeight) {\n await updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx)\n }\n\n return {\n ...existingRecord,\n dailyLoading,\n truck: await truckRepo.findOneBy({ id: existingRecord.truck.id }),\n block: await blockRepo.findOneBy({ id: existingRecord.block.id }),\n ramp: await rampRepo.findOneBy({ id: existingRecord.ramp.id }),\n totalBunchLoaded: foundDailyLoadingDetailPatch?.totalBunchLoaded \|\| 0,\n totalBunchWeight: foundDailyLoadingDetailPatch?.totalBunchWeight \|\| 0,\n remark: foundDailyLoadingDetailPatch?.remark \|\| null,\n updater: user\n }\n })\n )\n updatedDailyLoadingDetails = await dailyLoadingDetailRepo.save(updatedDailyLoadingDetails)\n }\n\n if (newDailyLoadingDetail?.length > 0) {\n await Promise.all(\n newDailyLoadingDetail.map(async (dailyLoadingDetail: DailyLoadingDetail) => {\n let newDailyLoadingDetail: DailyLoadingDetail = new DailyLoadingDetail()\n newDailyLoadingDetail.domain = domain\n newDailyLoadingDetail.name = NoGenerator.dailyLoadingDetail()\n newDailyLoadingDetail.truck = await truckRepo.findOneBy({ id: dailyLoadingDetail.truck.id })\n newDailyLoadingDetail.block = await blockRepo.findOneBy({ id: dailyLoadingDetail.block.id })\n newDailyLoadingDetail.ramp = await rampRepo.findOneBy({ id: dailyLoadingDetail.ramp.id })\n newDailyLoadingDetail.totalBunchLoaded = dailyLoadingDetail?.totalBunchLoaded \|\| 0\n newDailyLoadingDetail.totalBunchWeight = dailyLoadingDetail?.totalBunchWeight \|\| 0\n newDailyLoadingDetail.remark = dailyLoadingDetail?.remark \|\| null\n newDailyLoadingDetail.creator = user\n newDailyLoadingDetail.dailyLoading = dailyLoading\n\n await dailyLoadingDetailRepo.save(newDailyLoadingDetail)\n })\n )\n }\n}\n\nexport async function updatePlantationInventory(\n domain: Domain,\n dailyLoading: DailyLoading,\n foundDailyLoadingDetailPatch: any,\n existingRecord: DailyLoadingDetail,\n user: User,\n tx?: EntityManager\n): Promise<void> {\n const plantationInvRepo: Repository<PlantationInventory> =\n tx?.getRepository(PlantationInventory) \|\| getRepository(PlantationInventory)\n\n let existingRampTonnage: PlantationInventory = await plantationInvRepo.findOne({\n where: { domain: { id: domain.id }, type: INVENTORY_TYPE.RAMP_TONNAGE, ramp: { id: existingRecord.ramp.id } },\n relations: ['domain', 'block', 'ramp']\n })\n\n if (existingRampTonnage) {\n const tonnageChanges: number = foundDailyLoadingDetailPatch.totalBunchWeight - existingRecord.totalBunchWeight\n existingRampTonnage.totalTonnage = existingRampTonnage.totalTonnage + tonnageChanges\n existingRampTonnage.updater = user\n await plantationInvRepo.save(existingRampTonnage)\n\n await generateTransactionHistory(\n existingRampTonnage.block,\n domain,\n existingRampTonnage.ramp,\n dailyLoading.id,\n dailyLoading.name,\n TRANSACTION_TYPE.LOADING_ADJUSTMENT,\n dailyLoading.loadingDate,\n 0,\n tonnageChanges,\n user,\n tx\n )\n }\n}\n"]}

package/dist-server/graphql/resolvers/daily-loading-detail/daily-loading-detail-query.js CHANGED Viewed

@@ -13,7 +13,6 @@ exports.Query = {
         });
     },
     async dailyLoadingDetails(_, params, context) {
-        var _a;
         const { tx } = context.state;
         const queryBuilder = tx.getRepository(entities_1.DailyLoadingDetail).createQueryBuilder();
         (0, shell_1.buildQuery)(queryBuilder, params, context);
@@ -21,7 +20,7 @@ exports.Query = {
             .leftJoinAndSelect('DailyLoadingDetail.domain', 'Domain')
             .leftJoinAndSelect('DailyLoadingDetail.creator', 'Creator')
             .leftJoinAndSelect('DailyLoadingDetail.updater', 'Updater');
-        if (((_a = params.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
+        if (params.filters?.length > 0)
             queryBuilder.andWhere('DailyLoadingDetail.deletedAt IS NULL');
         else
             queryBuilder.where('DailyLoadingDetail.deletedAt IS NULL');

package/dist-server/graphql/resolvers/daily-loading-detail/daily-loading-detail-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"daily-loading-detail-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-detail/daily-loading-detail-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAkF;AAErE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QACjE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,6BAAwB,CAAC,CAAC,OAAO,CAAC;YAC9D,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;;QAC3E,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAwB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACpF,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,2BAA2B,EAAE,QAAQ,CAAC;aACxD,iBAAiB,CAAC,4BAA4B,EAAE,SAAS,CAAC;aAC1D,iBAAiB,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAA;QAE7D,IAAI,~~CAAA,MAAA,~~MAAM,CAAC,OAAO,~~0CAAE~~,MAAM,~~IAAG~~,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAA;;YACxF,YAAY,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAE/D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { EntityManager, IsNull } from 'typeorm'\n\nimport { buildQuery, Domain, ListParam } from '@things-factory/shell'\n\nimport { DailyLoadingDetail as DailyLoadingDetailEntity } from '../../../entities'\n\nexport const Query = {\n async dailyLoadingDetail(_: any, { name }, context: ResolverContext) {\n const { domain, tx } = context.state\n\n return await tx.getRepository(DailyLoadingDetailEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'creator', 'updater']\n })\n },\n\n async dailyLoadingDetails(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = tx.getRepository(DailyLoadingDetailEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('DailyLoadingDetail.domain', 'Domain')\n .leftJoinAndSelect('DailyLoadingDetail.creator', 'Creator')\n .leftJoinAndSelect('DailyLoadingDetail.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('DailyLoadingDetail.deletedAt IS NULL')\n else queryBuilder.where('DailyLoadingDetail.deletedAt IS NULL')\n\n const [items, total] = await queryBuilder.getManyAndCount()\n\n return { items, total }\n }\n}\n"]}
1	+ {"version":3,"file":"daily-loading-detail-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-detail/daily-loading-detail-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAkF;AAErE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QACjE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,6BAAwB,CAAC,CAAC,OAAO,CAAC;YAC9D,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;QAC3E,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAwB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACpF,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,2BAA2B,EAAE,QAAQ,CAAC;aACxD,iBAAiB,CAAC,4BAA4B,EAAE,SAAS,CAAC;aAC1D,iBAAiB,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAA;QAE7D,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAA;;YACxF,YAAY,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAE/D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { EntityManager, IsNull } from 'typeorm'\n\nimport { buildQuery, Domain, ListParam } from '@things-factory/shell'\n\nimport { DailyLoadingDetail as DailyLoadingDetailEntity } from '../../../entities'\n\nexport const Query = {\n async dailyLoadingDetail(_: any, { name }, context: ResolverContext) {\n const { domain, tx } = context.state\n\n return await tx.getRepository(DailyLoadingDetailEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'creator', 'updater']\n })\n },\n\n async dailyLoadingDetails(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = tx.getRepository(DailyLoadingDetailEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('DailyLoadingDetail.domain', 'Domain')\n .leftJoinAndSelect('DailyLoadingDetail.creator', 'Creator')\n .leftJoinAndSelect('DailyLoadingDetail.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('DailyLoadingDetail.deletedAt IS NULL')\n else queryBuilder.where('DailyLoadingDetail.deletedAt IS NULL')\n\n const [items, total] = await queryBuilder.getManyAndCount()\n\n return { items, total }\n }\n}\n"]}

package/dist-server/graphql/resolvers/daily-loading-ramp/index.js CHANGED Viewed

@@ -6,6 +6,9 @@ const update_daily_loading_ramp_1 = require("./update-daily-loading-ramp");
 const delete_daily_loading_ramp_1 = require("./delete-daily-loading-ramp");
 exports.DailyLoadingRampResolver = {
     Query: daily_loading_ramp_query_1.Query,
-    Mutation: Object.assign(Object.assign({}, update_daily_loading_ramp_1.updateDailyLoadingRamp), delete_daily_loading_ramp_1.deleteDailyLoadingRamp)
+    Mutation: {
+        ...update_daily_loading_ramp_1.updateDailyLoadingRamp,
+        ...delete_daily_loading_ramp_1.deleteDailyLoadingRamp
+    }
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/daily-loading-ramp/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-ramp/index.ts"],"names":[],"mappings":";;;AAAA,yEAAkD;AAElD,2EAAoE;AACpE,2EAAoE;AAEvD,QAAA,wBAAwB,GAAG;IACtC,KAAK,EAAL,gCAAK;IACL,QAAQ,~~kCACH~~,kDAAsB,~~GACtB~~,kDAAsB~~,CAC1B~~;CACF,CAAA","sourcesContent":["import { Query } from './daily-loading-ramp-query'\n\nimport { updateDailyLoadingRamp } from './update-daily-loading-ramp'\nimport { deleteDailyLoadingRamp } from './delete-daily-loading-ramp'\n\nexport const DailyLoadingRampResolver = {\n Query,\n Mutation: {\n ...updateDailyLoadingRamp,\n ...deleteDailyLoadingRamp\n }\n}\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-ramp/index.ts"],"names":[],"mappings":";;;AAAA,yEAAkD;AAElD,2EAAoE;AACpE,2EAAoE;AAEvD,QAAA,wBAAwB,GAAG;IACtC,KAAK,EAAL,gCAAK;IACL,QAAQ,EAAE;QACR,GAAG,kDAAsB;QACzB,GAAG,kDAAsB;KAC1B;CACF,CAAA","sourcesContent":["import { Query } from './daily-loading-ramp-query'\n\nimport { updateDailyLoadingRamp } from './update-daily-loading-ramp'\nimport { deleteDailyLoadingRamp } from './delete-daily-loading-ramp'\n\nexport const DailyLoadingRampResolver = {\n Query,\n Mutation: {\n ...updateDailyLoadingRamp,\n ...deleteDailyLoadingRamp\n }\n}\n"]}

package/dist-server/graphql/resolvers/daily-loading-ramp/update-daily-loading-ramp.js CHANGED Viewed

@@ -9,7 +9,11 @@ exports.updateDailyLoadingRamp = {
         const dailyLoadingRamp = await repository.findOne({
             where: { domain: { id: domain.id }, name }
         });
-        return await repository.save(Object.assign(Object.assign(Object.assign({}, dailyLoadingRamp), patch), { updater: user }));
+        return await repository.save({
+            ...dailyLoadingRamp,
+            ...patch,
+            updater: user
+        });
     }
 };
 //# sourceMappingURL=update-daily-loading-ramp.js.map

package/dist-server/graphql/resolvers/daily-loading-ramp/update-daily-loading-ramp.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-daily-loading-ramp.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-ramp/update-daily-loading-ramp.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAEvC,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAwB;QAC5E,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAChD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;SAC3C,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI~~,+CACvB~~,gBAAgB,~~GAChB~~,KAAK,~~KACR,~~OAAO,EAAE,IAAI,~~IACb~~,CAAA;IACJ,CAAC;CACF,CAAA","sourcesContent":["import { DailyLoadingRamp } from '../../../entities'\n\nexport const updateDailyLoadingRamp = {\n async updateDailyLoadingRamp(_: any, { name, patch }, context: ResolverContext) {\n const { domain, tx, user } = context.state\n\n const repository = tx.getRepository(DailyLoadingRamp)\n const dailyLoadingRamp = await repository.findOne({\n where: { domain: { id: domain.id }, name }\n })\n\n return await repository.save({\n ...dailyLoadingRamp,\n ...patch,\n updater: user\n })\n }\n}\n"]}
1	+ {"version":3,"file":"update-daily-loading-ramp.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading-ramp/update-daily-loading-ramp.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAEvC,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAwB;QAC5E,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAChD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;SAC3C,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC;YAC3B,GAAG,gBAAgB;YACnB,GAAG,KAAK;YACR,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;IACJ,CAAC;CACF,CAAA","sourcesContent":["import { DailyLoadingRamp } from '../../../entities'\n\nexport const updateDailyLoadingRamp = {\n async updateDailyLoadingRamp(_: any, { name, patch }, context: ResolverContext) {\n const { domain, tx, user } = context.state\n\n const repository = tx.getRepository(DailyLoadingRamp)\n const dailyLoadingRamp = await repository.findOne({\n where: { domain: { id: domain.id }, name }\n })\n\n return await repository.save({\n ...dailyLoadingRamp,\n ...patch,\n updater: user\n })\n }\n}\n"]}

package/dist-server/graphql/resolvers/dashboard/dashboard-query.js CHANGED Viewed

@@ -17,7 +17,14 @@ exports.Query = {
             let data = await getDailyProductionData(blockId, year, month, tx);
             let result = [];
             result = data.map(itm => {
-                return Object.assign(Object.assign({}, itm), { blockId, tonnage: itm.todayWeightCollected, year: itm.dateDay.getFullYear(), month: itm.dateDay.getMonth(), date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' }) });
+                return {
+                    ...itm,
+                    blockId,
+                    tonnage: itm.todayWeightCollected,
+                    year: itm.dateDay.getFullYear(),
+                    month: itm.dateDay.getMonth(),
+                    date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })
+                };
             });
             return result;
         }
@@ -31,7 +38,14 @@ exports.Query = {
             let data = await getDailyProductionData(blockId, year, month, tx);
             let result = [];
             result = data.map(itm => {
-                return Object.assign(Object.assign({}, itm), { blockId, yield: (itm.todayHectareCover != 0 ? itm.todayWeightCollected / itm.todayHectareCover : 0).toFixed(4), year: itm.dateDay.getFullYear(), month: itm.dateDay.getMonth(), date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' }) });
+                return {
+                    ...itm,
+                    blockId,
+                    yield: (itm.todayHectareCover != 0 ? itm.todayWeightCollected / itm.todayHectareCover : 0).toFixed(4),
+                    year: itm.dateDay.getFullYear(),
+                    month: itm.dateDay.getMonth(),
+                    date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })
+                };
             });
             return result;
         }

package/dist-server/graphql/resolvers/dashboard/dashboard-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dashboard-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/dashboard-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager } from 'typeorm'\n\n// import { buildQuery, ListParam } from '@things-factory/shell'\n\nexport const Query = {\n /*\n @param blockId: id of the block\n * @param yearAndMonth: the format will be something like 202001; combination of year 2020 and month 01\n * @returns tonnage data with its sorted date\n /\n async monthlyTonnageProductions(_: any, { blockId, yearAndMonth }, context: ResolverContext) {\n try {\n const { tx } = context.state\n\n const year = parseInt(yearAndMonth.substring(0, 4))\n const month = parseInt(yearAndMonth.substring(4))\n\n let data: any[] = await getDailyProductionData(blockId, year, month, tx)\n let result = []\n\n result = data.map(itm => {\n return {\n ...itm,\n blockId,\n tonnage: itm.todayWeightCollected,\n year: itm.dateDay.getFullYear(),\n month: itm.dateDay.getMonth(),\n date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })\n }\n })\n\n return result\n } catch (ex) {}\n },\n\n async monthlyYields(_: any, { blockId, yearAndMonth }, context: ResolverContext) {\n try {\n const { tx } = context.state\n\n const year = parseInt(yearAndMonth.substring(0, 4))\n const month = parseInt(yearAndMonth.substring(4))\n\n let data: any[] = await getDailyProductionData(blockId, year, month, tx)\n let result = []\n\n result = data.map(itm => {\n return {\n ...itm,\n blockId,\n yield: (itm.todayHectareCover != 0 ? itm.todayWeightCollected / itm.todayHectareCover : 0).toFixed(4),\n year: itm.dateDay.getFullYear(),\n month: itm.dateDay.getMonth(),\n date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })\n }\n })\n\n return result\n } catch (ex) {}\n },\n\n async weeklyBunchesCount(_: any, { targetDate }, context: ResolverContext) {\n if (!targetDate \|\| targetDate == '') targetDate = new Date()\n\n let bunchesCount = []\n\n for (let i = 0; i < 7; i++) {\n bunchesCount.push({\n date: new Date(targetDate).toLocaleString('default', { day: '2-digit', month: 'short' }),\n harvestedCount: 0,\n collectedCount: 0\n // harvestedCount: Math.floor(Math.random() 1000) + 500,\n // collectedCount: Math.floor(Math.random() * 500) + 50\n })\n targetDate.setDate(targetDate.getDate() - 1)\n }\n\n return bunchesCount.reverse()\n },\n\n async tonnageAndBunchesInventories(_: any, { something }, context: ResolverContext) {\n return {\n bunches: 0,\n tonnage: 0\n // bunches: Math.floor(Math.random() * 10000) + 500,\n // tonnage: Math.floor(Math.random() * 10000) + 500\n }\n },\n\n async productionsOverview(_: any, { something }, context: ResolverContext) {\n return {\n averageBunchWeight: 0,\n bunchesCount: 0,\n tonnageWeighed: 0\n // averageBunchWeight: Math.floor(Math.random() * 150) + 70,\n // bunchesCount: Math.floor(Math.random() * 10000) + 500,\n // tonnageWeighed: Math.floor(Math.random() * 10000) + 500\n }\n }\n}\n\nexport async function getDailyProductionData(\n blockId: String,\n year: number,\n month: number,\n tx: EntityManager\n): Promise<any> {\n await tx.query(`\n CREATE TEMP TABLE temp_blocks on commit drop AS (\n WITH RECURSIVE b AS ( \n SELECT b.id AS block_id, * FROM blocks b \n WHERE b.deleted_at IS null\n UNION ALL\n SELECT b.id AS block_id, cb.* FROM blocks cb\n INNER JOIN b ON b.id = cb.parent_block_id\n WHERE cb.deleted_at IS null\n )\n SELECT block_id, id, name FROM b \n ${blockId != 'all-blocks' && blockId != '' ? `WHERE block_id = '${blockId}' or id = '${blockId}'` : ``}\n GROUP BY block_id, id, name \n ORDER BY block_id, id, name \n );\n `)\n\n let fromDate = new Date(year, month - 1, 1)\n let toDate = new Date(year, month, 1)\n toDate.setDate(toDate.getDate() - 1)\n\n let fromDateString = [fromDate.getFullYear().toString(), String(fromDate.getMonth() + 1).padStart(2, '0'), '01'].join(\n '-'\n )\n\n let toDateString = [\n toDate.getFullYear().toString(),\n String(toDate.getMonth() + 1).padStart(2, '0'),\n String(toDate.getDate()).padStart(2, '0')\n ].join('-')\n\n await tx.query(\n `\n CREATE TEMP TABLE temp_records on commit drop AS (\t\n select blk.block_id, coalesce(sum(field_bunches),0) AS today_field_bunches, \n round(coalesce(sum(ramp_weight),0)::numeric,4) AS today_ramp_weight,\n sum(case when transaction_type = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,\n sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,\n round(sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,\n round(sum(case when transaction_type = 'DISPATCHMENT' OR transaction_type = 'DISPATCHMENT_ADJUSTMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,\t \n transaction_date\n from record_transactions t2\n inner join temp_blocks blk on blk.id = t2.block_id\n where transaction_date <= $1\n group by blk.block_id, transaction_date\n )\n `,\n [toDateString]\n )\n\n await tx.query(\n `\n create temp table temp_daily_production_data on commit drop as (\n select ,\n prev_bunch_bal_in_field + today_bunch_harvest as today_bunch_in_field,\n prev_bunch_bal_in_field + today_bunch_harvest - today_bunch_collected as today_bunch_bal_in_field,\n prev_weight_bal_in_ramp + today_ramp_weight_collected - today_weight_dispatch as today_weight_bal_in_ramp FROM (\n select md.dateDay as date_day,\n coalesce(\n (\n select sum(today_field_bunches) from temp_records t2 \n where transaction_date::timestamp < md.dateDay\n )\n , 0) as prev_bunch_bal_in_field,\n coalesce(\n (\n select sum(today_ramp_weight) from temp_records t2 \n where transaction_date::timestamp < md.dateDay\n )\n , 0) as prev_weight_bal_in_ramp,\n coalesce(today_bunch_harvest, 0) as today_bunch_harvest,\n coalesce(sum(today_bunch_harvest) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_harvest,\n coalesce(today_bunch_collected, 0) as today_bunch_collected, \n coalesce(sum(today_bunch_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_collected,\n coalesce(today_ramp_weight_collected, 0) as today_ramp_weight_collected, \n coalesce(sum(today_ramp_weight_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_ramp_weight_collected,\n coalesce(today_weight_dispatch, 0) as today_weight_dispatch, \n coalesce(sum(today_weight_dispatch) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_weight_dispatch,\n coalesce(tot.today_out_turn, 0) as today_out_turn,\n coalesce(sum(tot.today_out_turn) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_out_turn,\n ${\n blockId != 'all-blocks' && blockId != '' ? `(select name from blocks b2 WHERE id = '${blockId}')` : `''`\n } as block,\n coalesce(thr.today_harvesting_round, 0) as today_harvesting_round,\n coalesce(thr.today_hectare_cover, 0) as today_hectare_cover\n from \n (select generate_series((date '${fromDateString}')::timestamp, (date '${toDateString}')::timestamp, interval '1 day')::date as dateDay) as md \n left join (\n select from temp_records trx\n where transaction_date between $1 and $2 \n order by transaction_date\n ) as dt on dt.transaction_date::date = md.dateDay\n LEFT JOIN (\n select sum(harvesting_round) AS today_harvesting_round, sum(coverage) AS today_hectare_cover, harvest_date \n from daily_harvests dh \n inner join temp_blocks blk on blk.id = dh.block_id\n where harvest_date between $1 and $2\n group by blk.block_id, harvest_date\n ) as thr ON thr.harvest_date::date = md.dateDay\n LEFT JOIN (\n select count() AS today_out_turn, dh.harvest_date \n from daily_harvest_details dhd \n inner join daily_harvests dh on dh.id = dhd.daily_harvest_id\n inner join temp_blocks blk on blk.id = dh.block_id\n where dh.harvest_date between $1 and $2\n GROUP BY blk.block_id, dh.harvest_date\n ) as tot ON tot.harvest_date::date = md.dateDay\n ) dt\n )`,\n [fromDateString, toDateString]\n )\n\n const result: any = await tx.query(`\n select from temp_daily_production_data dt\n `)\n\n return result.map(itm => {\n return {\n block: itm.block,\n dateDay: itm.date_day,\n diffInBunches: parseFloat(itm.diff_in_bunches).toFixed(1),\n prevBunchBalInField: parseFloat(itm.prev_bunch_bal_in_field).toFixed(1),\n prevWeightBalInRamp: parseFloat(itm.prev_weight_bal_in_ramp).toFixed(4),\n toDateBunchHarvest: parseFloat(itm.to_date_bunch_harvest).toFixed(1),\n toDateOutTurn: itm.to_date_out_turn,\n toDateWeightDispatch: parseFloat(itm.to_date_weight_dispatch).toFixed(4),\n todayBunchBalInField: parseFloat(itm.today_bunch_bal_in_field).toFixed(1),\n todayBunchCollected: parseFloat(itm.today_bunch_collected).toFixed(1),\n todayBunchHarvest: parseFloat(itm.today_bunch_harvest).toFixed(1),\n todayBunchInField: parseFloat(itm.today_bunch_in_field).toFixed(1),\n todayHarvestingRound: itm.today_harvesting_round,\n todayHectareCover: parseFloat(itm.today_hectare_cover).toFixed(4),\n todayOutTurn: itm.today_out_turn,\n todayWeightCollected: parseFloat(itm.today_ramp_weight_collected).toFixed(4),\n todayWeightBalInRamp: parseFloat(itm.today_weight_bal_in_ramp).toFixed(4),\n todayWeightDispatch: parseFloat(itm.today_weight_dispatch).toFixed(4)\n }\n })\n}\n"]}
1	+ {"version":3,"file":"dashboard-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/dashboard-query.ts"],"names":[],"mappings":";;;AAoGA,wDAgJC;AAlPD,gEAAgE;AAEnD,QAAA,KAAK,GAAG;IACnB;;;;OAIG;IACH,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAwB;QACzF,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YAE5B,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;YAEjD,IAAI,IAAI,GAAU,MAAM,sBAAsB,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;YACxE,IAAI,MAAM,GAAG,EAAE,CAAA;YAEf,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACtB,OAAO;oBACL,GAAG,GAAG;oBACN,OAAO;oBACP,OAAO,EAAE,GAAG,CAAC,oBAAoB;oBACjC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC/B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC7B,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;iBAChF,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAwB;QAC7E,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YAE5B,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;YAEjD,IAAI,IAAI,GAAU,MAAM,sBAAsB,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;YACxE,IAAI,MAAM,GAAG,EAAE,CAAA;YAEf,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACtB,OAAO;oBACL,GAAG,GAAG;oBACN,OAAO;oBACP,KAAK,EAAE,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;oBACrG,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC/B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC7B,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;iBAChF,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,UAAU,EAAE,EAAE,OAAwB;QACvE,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,EAAE;YAAE,UAAU,GAAG,IAAI,IAAI,EAAE,CAAA;QAE5D,IAAI,YAAY,GAAG,EAAE,CAAA;QAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBACxF,cAAc,EAAE,CAAC;gBACjB,cAAc,EAAE,CAAC;gBACjB,0DAA0D;gBAC1D,uDAAuD;aACxD,CAAC,CAAA;YACF,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QAC9C,CAAC;QAED,OAAO,YAAY,CAAC,OAAO,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,SAAS,EAAE,EAAE,OAAwB;QAChF,OAAO;YACL,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,oDAAoD;YACpD,mDAAmD;SACpD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,SAAS,EAAE,EAAE,OAAwB;QACvE,OAAO;YACL,kBAAkB,EAAE,CAAC;YACrB,YAAY,EAAE,CAAC;YACf,cAAc,EAAE,CAAC;YACjB,4DAA4D;YAC5D,yDAAyD;YACzD,0DAA0D;SAC3D,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,KAAa,EACb,EAAiB;IAEjB,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;QAWT,OAAO,IAAI,YAAY,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,OAAO,cAAc,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE;;;;GAIzG,CAAC,CAAA;IAEF,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;IAEpC,IAAI,cAAc,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CACnH,GAAG,CACJ,CAAA;IAED,IAAI,YAAY,GAAG;QACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;QAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;KAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAEX,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;GAcD,EACC,CAAC,YAAY,CAAC,CACf,CAAA;IAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8BM,OAAO,IAAI,YAAY,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,2CAA2C,OAAO,IAAI,CAAC,CAAC,CAAC,IACtG;;;;yCAIiC,cAAc,yBAAyB,YAAY;;;;;;;;;;;;;;;;;;;;;;MAsBtF,EACF,CAAC,cAAc,EAAE,YAAY,CAAC,CAC/B,CAAA;IAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;GAElC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO;YACL,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,OAAO,EAAE,GAAG,CAAC,QAAQ;YACrB,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzD,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACvE,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACvE,kBAAkB,EAAE,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACpE,aAAa,EAAE,GAAG,CAAC,gBAAgB;YACnC,oBAAoB,EAAE,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,oBAAoB,EAAE,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrE,iBAAiB,EAAE,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACjE,iBAAiB,EAAE,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAClE,oBAAoB,EAAE,GAAG,CAAC,sBAAsB;YAChD,iBAAiB,EAAE,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACjE,YAAY,EAAE,GAAG,CAAC,cAAc;YAChC,oBAAoB,EAAE,UAAU,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5E,oBAAoB,EAAE,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;SACtE,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { EntityManager } from 'typeorm'\n\n// import { buildQuery, ListParam } from '@things-factory/shell'\n\nexport const Query = {\n /*\n @param blockId: id of the block\n * @param yearAndMonth: the format will be something like 202001; combination of year 2020 and month 01\n * @returns tonnage data with its sorted date\n /\n async monthlyTonnageProductions(_: any, { blockId, yearAndMonth }, context: ResolverContext) {\n try {\n const { tx } = context.state\n\n const year = parseInt(yearAndMonth.substring(0, 4))\n const month = parseInt(yearAndMonth.substring(4))\n\n let data: any[] = await getDailyProductionData(blockId, year, month, tx)\n let result = []\n\n result = data.map(itm => {\n return {\n ...itm,\n blockId,\n tonnage: itm.todayWeightCollected,\n year: itm.dateDay.getFullYear(),\n month: itm.dateDay.getMonth(),\n date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })\n }\n })\n\n return result\n } catch (ex) {}\n },\n\n async monthlyYields(_: any, { blockId, yearAndMonth }, context: ResolverContext) {\n try {\n const { tx } = context.state\n\n const year = parseInt(yearAndMonth.substring(0, 4))\n const month = parseInt(yearAndMonth.substring(4))\n\n let data: any[] = await getDailyProductionData(blockId, year, month, tx)\n let result = []\n\n result = data.map(itm => {\n return {\n ...itm,\n blockId,\n yield: (itm.todayHectareCover != 0 ? itm.todayWeightCollected / itm.todayHectareCover : 0).toFixed(4),\n year: itm.dateDay.getFullYear(),\n month: itm.dateDay.getMonth(),\n date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' })\n }\n })\n\n return result\n } catch (ex) {}\n },\n\n async weeklyBunchesCount(_: any, { targetDate }, context: ResolverContext) {\n if (!targetDate \|\| targetDate == '') targetDate = new Date()\n\n let bunchesCount = []\n\n for (let i = 0; i < 7; i++) {\n bunchesCount.push({\n date: new Date(targetDate).toLocaleString('default', { day: '2-digit', month: 'short' }),\n harvestedCount: 0,\n collectedCount: 0\n // harvestedCount: Math.floor(Math.random() 1000) + 500,\n // collectedCount: Math.floor(Math.random() * 500) + 50\n })\n targetDate.setDate(targetDate.getDate() - 1)\n }\n\n return bunchesCount.reverse()\n },\n\n async tonnageAndBunchesInventories(_: any, { something }, context: ResolverContext) {\n return {\n bunches: 0,\n tonnage: 0\n // bunches: Math.floor(Math.random() * 10000) + 500,\n // tonnage: Math.floor(Math.random() * 10000) + 500\n }\n },\n\n async productionsOverview(_: any, { something }, context: ResolverContext) {\n return {\n averageBunchWeight: 0,\n bunchesCount: 0,\n tonnageWeighed: 0\n // averageBunchWeight: Math.floor(Math.random() * 150) + 70,\n // bunchesCount: Math.floor(Math.random() * 10000) + 500,\n // tonnageWeighed: Math.floor(Math.random() * 10000) + 500\n }\n }\n}\n\nexport async function getDailyProductionData(\n blockId: String,\n year: number,\n month: number,\n tx: EntityManager\n): Promise<any> {\n await tx.query(`\n CREATE TEMP TABLE temp_blocks on commit drop AS (\n WITH RECURSIVE b AS ( \n SELECT b.id AS block_id, * FROM blocks b \n WHERE b.deleted_at IS null\n UNION ALL\n SELECT b.id AS block_id, cb.* FROM blocks cb\n INNER JOIN b ON b.id = cb.parent_block_id\n WHERE cb.deleted_at IS null\n )\n SELECT block_id, id, name FROM b \n ${blockId != 'all-blocks' && blockId != '' ? `WHERE block_id = '${blockId}' or id = '${blockId}'` : ``}\n GROUP BY block_id, id, name \n ORDER BY block_id, id, name \n );\n `)\n\n let fromDate = new Date(year, month - 1, 1)\n let toDate = new Date(year, month, 1)\n toDate.setDate(toDate.getDate() - 1)\n\n let fromDateString = [fromDate.getFullYear().toString(), String(fromDate.getMonth() + 1).padStart(2, '0'), '01'].join(\n '-'\n )\n\n let toDateString = [\n toDate.getFullYear().toString(),\n String(toDate.getMonth() + 1).padStart(2, '0'),\n String(toDate.getDate()).padStart(2, '0')\n ].join('-')\n\n await tx.query(\n `\n CREATE TEMP TABLE temp_records on commit drop AS (\t\n select blk.block_id, coalesce(sum(field_bunches),0) AS today_field_bunches, \n round(coalesce(sum(ramp_weight),0)::numeric,4) AS today_ramp_weight,\n sum(case when transaction_type = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,\n sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,\n round(sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,\n round(sum(case when transaction_type = 'DISPATCHMENT' OR transaction_type = 'DISPATCHMENT_ADJUSTMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,\t \n transaction_date\n from record_transactions t2\n inner join temp_blocks blk on blk.id = t2.block_id\n where transaction_date <= $1\n group by blk.block_id, transaction_date\n )\n `,\n [toDateString]\n )\n\n await tx.query(\n `\n create temp table temp_daily_production_data on commit drop as (\n select ,\n prev_bunch_bal_in_field + today_bunch_harvest as today_bunch_in_field,\n prev_bunch_bal_in_field + today_bunch_harvest - today_bunch_collected as today_bunch_bal_in_field,\n prev_weight_bal_in_ramp + today_ramp_weight_collected - today_weight_dispatch as today_weight_bal_in_ramp FROM (\n select md.dateDay as date_day,\n coalesce(\n (\n select sum(today_field_bunches) from temp_records t2 \n where transaction_date::timestamp < md.dateDay\n )\n , 0) as prev_bunch_bal_in_field,\n coalesce(\n (\n select sum(today_ramp_weight) from temp_records t2 \n where transaction_date::timestamp < md.dateDay\n )\n , 0) as prev_weight_bal_in_ramp,\n coalesce(today_bunch_harvest, 0) as today_bunch_harvest,\n coalesce(sum(today_bunch_harvest) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_harvest,\n coalesce(today_bunch_collected, 0) as today_bunch_collected, \n coalesce(sum(today_bunch_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_collected,\n coalesce(today_ramp_weight_collected, 0) as today_ramp_weight_collected, \n coalesce(sum(today_ramp_weight_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_ramp_weight_collected,\n coalesce(today_weight_dispatch, 0) as today_weight_dispatch, \n coalesce(sum(today_weight_dispatch) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_weight_dispatch,\n coalesce(tot.today_out_turn, 0) as today_out_turn,\n coalesce(sum(tot.today_out_turn) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_out_turn,\n ${\n blockId != 'all-blocks' && blockId != '' ? `(select name from blocks b2 WHERE id = '${blockId}')` : `''`\n } as block,\n coalesce(thr.today_harvesting_round, 0) as today_harvesting_round,\n coalesce(thr.today_hectare_cover, 0) as today_hectare_cover\n from \n (select generate_series((date '${fromDateString}')::timestamp, (date '${toDateString}')::timestamp, interval '1 day')::date as dateDay) as md \n left join (\n select from temp_records trx\n where transaction_date between $1 and $2 \n order by transaction_date\n ) as dt on dt.transaction_date::date = md.dateDay\n LEFT JOIN (\n select sum(harvesting_round) AS today_harvesting_round, sum(coverage) AS today_hectare_cover, harvest_date \n from daily_harvests dh \n inner join temp_blocks blk on blk.id = dh.block_id\n where harvest_date between $1 and $2\n group by blk.block_id, harvest_date\n ) as thr ON thr.harvest_date::date = md.dateDay\n LEFT JOIN (\n select count() AS today_out_turn, dh.harvest_date \n from daily_harvest_details dhd \n inner join daily_harvests dh on dh.id = dhd.daily_harvest_id\n inner join temp_blocks blk on blk.id = dh.block_id\n where dh.harvest_date between $1 and $2\n GROUP BY blk.block_id, dh.harvest_date\n ) as tot ON tot.harvest_date::date = md.dateDay\n ) dt\n )`,\n [fromDateString, toDateString]\n )\n\n const result: any = await tx.query(`\n select from temp_daily_production_data dt\n `)\n\n return result.map(itm => {\n return {\n block: itm.block,\n dateDay: itm.date_day,\n diffInBunches: parseFloat(itm.diff_in_bunches).toFixed(1),\n prevBunchBalInField: parseFloat(itm.prev_bunch_bal_in_field).toFixed(1),\n prevWeightBalInRamp: parseFloat(itm.prev_weight_bal_in_ramp).toFixed(4),\n toDateBunchHarvest: parseFloat(itm.to_date_bunch_harvest).toFixed(1),\n toDateOutTurn: itm.to_date_out_turn,\n toDateWeightDispatch: parseFloat(itm.to_date_weight_dispatch).toFixed(4),\n todayBunchBalInField: parseFloat(itm.today_bunch_bal_in_field).toFixed(1),\n todayBunchCollected: parseFloat(itm.today_bunch_collected).toFixed(1),\n todayBunchHarvest: parseFloat(itm.today_bunch_harvest).toFixed(1),\n todayBunchInField: parseFloat(itm.today_bunch_in_field).toFixed(1),\n todayHarvestingRound: itm.today_harvesting_round,\n todayHectareCover: parseFloat(itm.today_hectare_cover).toFixed(4),\n todayOutTurn: itm.today_out_turn,\n todayWeightCollected: parseFloat(itm.today_ramp_weight_collected).toFixed(4),\n todayWeightBalInRamp: parseFloat(itm.today_weight_bal_in_ramp).toFixed(4),\n todayWeightDispatch: parseFloat(itm.today_weight_dispatch).toFixed(4)\n }\n })\n}\n"]}

package/dist-server/graphql/resolvers/organization/index.js CHANGED Viewed

@@ -6,6 +6,9 @@ const update_multiple_organization_1 = require("./update-multiple-organization")
 const delete_organizations_1 = require("./delete-organizations");
 exports.OrganizationResolver = {
     Query: organization_query_1.Query,
-    Mutation: Object.assign(Object.assign({}, update_multiple_organization_1.updateMultipleOrganizationResolver), delete_organizations_1.deleteOrganizations)
+    Mutation: {
+        ...update_multiple_organization_1.updateMultipleOrganizationResolver,
+        ...delete_organizations_1.deleteOrganizations
+    }
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/organization/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/index.ts"],"names":[],"mappings":";;;AAAA,6DAA4C;AAC5C,iFAAmF;AACnF,iEAA4D;AAE/C,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAL,0BAAK;IACL,QAAQ,~~kCACH~~,iEAAkC,~~GAClC~~,0CAAmB~~,CACvB~~;CACF,CAAA","sourcesContent":["import { Query } from './organization-query'\nimport { updateMultipleOrganizationResolver } from './update-multiple-organization'\nimport { deleteOrganizations } from './delete-organizations'\n\nexport const OrganizationResolver = {\n Query,\n Mutation: {\n ...updateMultipleOrganizationResolver,\n ...deleteOrganizations\n }\n}\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/index.ts"],"names":[],"mappings":";;;AAAA,6DAA4C;AAC5C,iFAAmF;AACnF,iEAA4D;AAE/C,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAL,0BAAK;IACL,QAAQ,EAAE;QACR,GAAG,iEAAkC;QACrC,GAAG,0CAAmB;KACvB;CACF,CAAA","sourcesContent":["import { Query } from './organization-query'\nimport { updateMultipleOrganizationResolver } from './update-multiple-organization'\nimport { deleteOrganizations } from './delete-organizations'\n\nexport const OrganizationResolver = {\n Query,\n Mutation: {\n ...updateMultipleOrganizationResolver,\n ...deleteOrganizations\n }\n}\n"]}

package/dist-server/graphql/resolvers/organization/organization-query.js CHANGED Viewed

@@ -13,7 +13,6 @@ exports.Query = {
         });
     },
     async organizations(_, params, context) {
-        var _a;
         const { tx } = context.state;
         const queryBuilder = tx.getRepository(entities_1.Organization).createQueryBuilder();
         (0, shell_1.buildQuery)(queryBuilder, params, context);
@@ -21,7 +20,7 @@ exports.Query = {
             .leftJoinAndSelect('Organization.domain', 'Domain')
             .leftJoinAndSelect('Organization.creator', 'Creator')
             .leftJoinAndSelect('Organization.updater', 'Updater');
-        if (((_a = params.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
+        if (params.filters?.length > 0)
             queryBuilder.andWhere('Organization.deletedAt IS NULL');
         else
             queryBuilder.where('Organization.deletedAt IS NULL');

package/dist-server/graphql/resolvers/organization/organization-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"organization-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/organization-query.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,iDAA6D;AAE7D,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;;QACrE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,~~CAAA,MAAA,~~MAAM,CAAC,OAAO,~~0CAAE~~,MAAM,~~IAAG~~,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { IsNull } from 'typeorm'\n\nimport { buildQuery, ListParam } from '@things-factory/shell'\n\nimport { Organization as OrganizationEntity } from '../../../entities'\n\nexport const Query = {\n async organization(_: any, { name }, context: ResolverContext) {\n const { tx, domain } = context.state\n\n return await tx.getRepository(OrganizationEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'creator', 'updater']\n })\n },\n\n async organizations(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = tx.getRepository(OrganizationEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('Organization.domain', 'Domain')\n .leftJoinAndSelect('Organization.creator', 'Creator')\n .leftJoinAndSelect('Organization.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('Organization.deletedAt IS NULL')\n else queryBuilder.where('Organization.deletedAt IS NULL')\n\n const [items, total] = await queryBuilder.getManyAndCount()\n\n return { items, total }\n }\n}\n"]}
1	+ {"version":3,"file":"organization-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/organization-query.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,iDAA6D;AAE7D,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;QACrE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { IsNull } from 'typeorm'\n\nimport { buildQuery, ListParam } from '@things-factory/shell'\n\nimport { Organization as OrganizationEntity } from '../../../entities'\n\nexport const Query = {\n async organization(_: any, { name }, context: ResolverContext) {\n const { tx, domain } = context.state\n\n return await tx.getRepository(OrganizationEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'creator', 'updater']\n })\n },\n\n async organizations(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = tx.getRepository(OrganizationEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('Organization.domain', 'Domain')\n .leftJoinAndSelect('Organization.creator', 'Creator')\n .leftJoinAndSelect('Organization.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('Organization.deletedAt IS NULL')\n else queryBuilder.where('Organization.deletedAt IS NULL')\n\n const [items, total] = await queryBuilder.getManyAndCount()\n\n return { items, total }\n }\n}\n"]}

package/dist-server/graphql/resolvers/organization/update-multiple-organization.js CHANGED Viewed

@@ -16,16 +16,26 @@ async function updateMultipleOrganization(_, { patches }, context) {
     if (_createRecords.length > 0) {
         for (let i = 0; i < _createRecords.length; i++) {
             const newRecord = _createRecords[i];
-            const result = await organizationRepo.save(Object.assign(Object.assign({}, newRecord), { domain, status: constants_1.ORGANIZATION_STATUS.ACTIVE, creator: user, updater: user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
+            const result = await organizationRepo.save({
+                ...newRecord,
+                domain,
+                status: constants_1.ORGANIZATION_STATUS.ACTIVE,
+                creator: user,
+                updater: user
+            });
+            results.push({ ...result, cuFlag: '+' });
         }
     }
     if (_updateRecords.length > 0) {
         for (let i = 0; i < _updateRecords.length; i++) {
             const newRecord = _updateRecords[i];
             const organization = await organizationRepo.findOneBy({ id: newRecord.id });
-            const result = await organizationRepo.save(Object.assign(Object.assign(Object.assign({}, organization), newRecord), { updater: user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+            const result = await organizationRepo.save({
+                ...organization,
+                ...newRecord,
+                updater: user
+            });
+            results.push({ ...result, cuFlag: 'M' });
         }
     }
     return results;

package/dist-server/graphql/resolvers/organization/update-multiple-organization.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-multiple-organization.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/update-multiple-organization.ts"],"names":[],"mappings":";;;AAOA,gEAwCC;AA/CD,kDAAwD;AACxD,gDAAgD;AAEnC,QAAA,kCAAkC,GAAG;IAChD,0BAA0B;CAC3B,CAAA;AAEM,KAAK,UAAU,0BAA0B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAwB;IAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAA;IAEvD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAEnC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,~~iCACrC~~,SAAS,~~KACZ,~~MAAM,~~EACN,~~MAAM,EAAE,+BAAmB,CAAC,MAAM,~~EAClC,~~OAAO,EAAE,IAAI,~~EACb,~~OAAO,EAAE,IAAI,~~IACb~~,CAAA;YAEF,OAAO,CAAC,IAAI,~~iCAAM~~,MAAM,~~KAAE~~,MAAM,EAAE,GAAG,~~IAAG~~,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;YAE3E,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI~~,+CACrC~~,YAAY,~~GACZ~~,SAAS,~~KACZ,~~OAAO,EAAE,IAAI,~~IACb~~,CAAA;YAEF,OAAO,CAAC,IAAI,~~iCAAM~~,MAAM,~~KAAE~~,MAAM,EAAE,GAAG,~~IAAG~~,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import { ORGANIZATION_STATUS } from '../../../constants'\nimport { Organization } from '../../../entities'\n\nexport const updateMultipleOrganizationResolver = {\n updateMultipleOrganization\n}\n\nexport async function updateMultipleOrganization(_: any, { patches }, context: ResolverContext) {\n const { tx, domain, user } = context.state\n\n let results = []\n const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n const organizationRepo = tx.getRepository(Organization)\n\n if (_createRecords.length > 0) {\n for (let i = 0; i < _createRecords.length; i++) {\n const newRecord = _createRecords[i]\n\n const result = await organizationRepo.save({\n ...newRecord,\n domain,\n status: ORGANIZATION_STATUS.ACTIVE,\n creator: user,\n updater: user\n })\n\n results.push({ ...result, cuFlag: '+' })\n }\n }\n\n if (_updateRecords.length > 0) {\n for (let i = 0; i < _updateRecords.length; i++) {\n const newRecord = _updateRecords[i]\n const organization = await organizationRepo.findOneBy({ id: newRecord.id })\n\n const result = await organizationRepo.save({\n ...organization,\n ...newRecord,\n updater: user\n })\n\n results.push({ ...result, cuFlag: 'M' })\n }\n }\n\n return results\n}\n"]}
1	+ {"version":3,"file":"update-multiple-organization.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization/update-multiple-organization.ts"],"names":[],"mappings":";;;AAOA,gEAwCC;AA/CD,kDAAwD;AACxD,gDAAgD;AAEnC,QAAA,kCAAkC,GAAG;IAChD,0BAA0B;CAC3B,CAAA;AAEM,KAAK,UAAU,0BAA0B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAwB;IAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAA;IAEvD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAEnC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC;gBACzC,GAAG,SAAS;gBACZ,MAAM;gBACN,MAAM,EAAE,+BAAmB,CAAC,MAAM;gBAClC,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;YAE3E,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC;gBACzC,GAAG,YAAY;gBACf,GAAG,SAAS;gBACZ,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import { ORGANIZATION_STATUS } from '../../../constants'\nimport { Organization } from '../../../entities'\n\nexport const updateMultipleOrganizationResolver = {\n updateMultipleOrganization\n}\n\nexport async function updateMultipleOrganization(_: any, { patches }, context: ResolverContext) {\n const { tx, domain, user } = context.state\n\n let results = []\n const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n const organizationRepo = tx.getRepository(Organization)\n\n if (_createRecords.length > 0) {\n for (let i = 0; i < _createRecords.length; i++) {\n const newRecord = _createRecords[i]\n\n const result = await organizationRepo.save({\n ...newRecord,\n domain,\n status: ORGANIZATION_STATUS.ACTIVE,\n creator: user,\n updater: user\n })\n\n results.push({ ...result, cuFlag: '+' })\n }\n }\n\n if (_updateRecords.length > 0) {\n for (let i = 0; i < _updateRecords.length; i++) {\n const newRecord = _updateRecords[i]\n const organization = await organizationRepo.findOneBy({ id: newRecord.id })\n\n const result = await organizationRepo.save({\n ...organization,\n ...newRecord,\n updater: user\n })\n\n results.push({ ...result, cuFlag: 'M' })\n }\n }\n\n return results\n}\n"]}

package/dist-server/graphql/resolvers/organization-staff/index.js CHANGED Viewed

@@ -6,6 +6,9 @@ const update_multiple_organization_staff_1 = require("./update-multiple-organiza
 const delete_organization_staffs_1 = require("./delete-organization-staffs");
 exports.OrganizationStaffResolver = {
     Query: organization_staff_query_1.Query,
-    Mutation: Object.assign(Object.assign({}, update_multiple_organization_staff_1.updateMultipleOrganizationStaffResolver), delete_organization_staffs_1.deleteOrganizationStaffs)
+    Mutation: {
+        ...update_multiple_organization_staff_1.updateMultipleOrganizationStaffResolver,
+        ...delete_organization_staffs_1.deleteOrganizationStaffs
+    }
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/organization-staff/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/index.ts"],"names":[],"mappings":";;;AAAA,yEAAkD;AAElD,6FAA8F;AAC9F,6EAAuE;AAE1D,QAAA,yBAAyB,GAAG;IACvC,KAAK,EAAL,gCAAK;IACL,QAAQ,~~kCACH~~,4EAAuC,~~GACvC~~,qDAAwB~~,CAC5B~~;CACF,CAAA","sourcesContent":["import { Query } from './organization-staff-query'\n\nimport { updateMultipleOrganizationStaffResolver } from './update-multiple-organization-staff'\nimport { deleteOrganizationStaffs } from './delete-organization-staffs'\n\nexport const OrganizationStaffResolver = {\n Query,\n Mutation: {\n ...updateMultipleOrganizationStaffResolver,\n ...deleteOrganizationStaffs\n }\n}\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/index.ts"],"names":[],"mappings":";;;AAAA,yEAAkD;AAElD,6FAA8F;AAC9F,6EAAuE;AAE1D,QAAA,yBAAyB,GAAG;IACvC,KAAK,EAAL,gCAAK;IACL,QAAQ,EAAE;QACR,GAAG,4EAAuC;QAC1C,GAAG,qDAAwB;KAC5B;CACF,CAAA","sourcesContent":["import { Query } from './organization-staff-query'\n\nimport { updateMultipleOrganizationStaffResolver } from './update-multiple-organization-staff'\nimport { deleteOrganizationStaffs } from './delete-organization-staffs'\n\nexport const OrganizationStaffResolver = {\n Query,\n Mutation: {\n ...updateMultipleOrganizationStaffResolver,\n ...deleteOrganizationStaffs\n }\n}\n"]}

package/dist-server/graphql/resolvers/organization-staff/organization-staff-query.js CHANGED Viewed

@@ -13,7 +13,6 @@ exports.Query = {
         });
     },
     async organizationStaffs(_, params, context) {
-        var _a;
         const { tx } = context.state;
         const queryBuilder = await tx.getRepository(entities_1.OrganizationStaff).createQueryBuilder();
         (0, shell_1.buildQuery)(queryBuilder, params, context);
@@ -22,14 +21,16 @@ exports.Query = {
             .leftJoinAndSelect('OrganizationStaff.organization', 'Organization')
             .leftJoinAndSelect('OrganizationStaff.creator', 'Creator')
             .leftJoinAndSelect('OrganizationStaff.updater', 'Updater');
-        if (((_a = params.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
+        if (params.filters?.length > 0)
             queryBuilder.andWhere('OrganizationStaff.deletedAt IS NULL');
         else
             queryBuilder.where('OrganizationStaff.deletedAt IS NULL');
         let [items, total] = await queryBuilder.getManyAndCount();
         items = items.map(item => {
-            var _a;
-            return Object.assign(Object.assign({}, item), { organizationName: (_a = item.organization) === null || _a === void 0 ? void 0 : _a.name });
+            return {
+                ...item,
+                organizationName: item.organization?.name
+            };
         });
         return { items, total };
     }

package/dist-server/graphql/resolvers/organization-staff/organization-staff-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"organization-staff-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/organization-staff-query.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,iDAA6D;AAE7D,gDAAgF;AAEnE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QAChE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAuB,CAAC,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5D,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;;QAC1E,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAuB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACzF,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,0BAA0B,EAAE,QAAQ,CAAC;aACvD,iBAAiB,CAAC,gCAAgC,EAAE,cAAc,CAAC;aACnE,iBAAiB,CAAC,2BAA2B,EAAE,SAAS,CAAC;aACzD,iBAAiB,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAA;QAE5D,IAAI,~~CAAA,MAAA,~~MAAM,CAAC,OAAO,~~0CAAE~~,MAAM,~~IAAG~~,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAA;;YACvF,YAAY,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;QAE9D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAEzD,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YACvB,~~uCACK~~,IAAI,~~KACP,~~gBAAgB,EAAE,~~MAAA,~~IAAI,CAAC,YAAY,~~0CAAE~~,IAAI,~~IAC1C~~;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { IsNull } from 'typeorm'\n\nimport { buildQuery, ListParam } from '@things-factory/shell'\n\nimport { OrganizationStaff as OrganizationStaffEntity } from '../../../entities'\n\nexport const Query = {\n async organizationStaff(_: any, { name }, context: ResolverContext) {\n const { tx, domain } = context.state\n\n return await tx.getRepository(OrganizationStaffEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'organization', 'creator', 'updater']\n })\n },\n\n async organizationStaffs(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = await tx.getRepository(OrganizationStaffEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('OrganizationStaff.domain', 'Domain')\n .leftJoinAndSelect('OrganizationStaff.organization', 'Organization')\n .leftJoinAndSelect('OrganizationStaff.creator', 'Creator')\n .leftJoinAndSelect('OrganizationStaff.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('OrganizationStaff.deletedAt IS NULL')\n else queryBuilder.where('OrganizationStaff.deletedAt IS NULL')\n\n let [items, total] = await queryBuilder.getManyAndCount()\n\n items = items.map(item => {\n return {\n ...item,\n organizationName: item.organization?.name\n }\n })\n\n return { items, total }\n }\n}\n"]}
1	+ {"version":3,"file":"organization-staff-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/organization-staff-query.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,iDAA6D;AAE7D,gDAAgF;AAEnE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAwB;QAChE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAuB,CAAC,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5D,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAwB;QAC1E,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE5B,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAuB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACzF,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,0BAA0B,EAAE,QAAQ,CAAC;aACvD,iBAAiB,CAAC,gCAAgC,EAAE,cAAc,CAAC;aACnE,iBAAiB,CAAC,2BAA2B,EAAE,SAAS,CAAC;aACzD,iBAAiB,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAA;QAE5D,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAA;;YACvF,YAAY,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;QAE9D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAEzD,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO;gBACL,GAAG,IAAI;gBACP,gBAAgB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI;aAC1C,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA","sourcesContent":["import { IsNull } from 'typeorm'\n\nimport { buildQuery, ListParam } from '@things-factory/shell'\n\nimport { OrganizationStaff as OrganizationStaffEntity } from '../../../entities'\n\nexport const Query = {\n async organizationStaff(_: any, { name }, context: ResolverContext) {\n const { tx, domain } = context.state\n\n return await tx.getRepository(OrganizationStaffEntity).findOne({\n where: { domain: { id: domain.id }, name, deletedAt: IsNull() },\n relations: ['domain', 'organization', 'creator', 'updater']\n })\n },\n\n async organizationStaffs(_: any, params: ListParam, context: ResolverContext) {\n const { tx } = context.state\n\n const queryBuilder = await tx.getRepository(OrganizationStaffEntity).createQueryBuilder()\n buildQuery(queryBuilder, params, context)\n\n queryBuilder\n .leftJoinAndSelect('OrganizationStaff.domain', 'Domain')\n .leftJoinAndSelect('OrganizationStaff.organization', 'Organization')\n .leftJoinAndSelect('OrganizationStaff.creator', 'Creator')\n .leftJoinAndSelect('OrganizationStaff.updater', 'Updater')\n\n if (params.filters?.length > 0) queryBuilder.andWhere('OrganizationStaff.deletedAt IS NULL')\n else queryBuilder.where('OrganizationStaff.deletedAt IS NULL')\n\n let [items, total] = await queryBuilder.getManyAndCount()\n\n items = items.map(item => {\n return {\n ...item,\n organizationName: item.organization?.name\n }\n })\n\n return { items, total }\n }\n}\n"]}

package/dist-server/graphql/resolvers/organization-staff/update-multiple-organization-staff.js CHANGED Viewed

@@ -8,7 +8,6 @@ exports.updateMultipleOrganizationStaffResolver = {
     updateMultipleOrganizationStaff
 };
 async function updateMultipleOrganizationStaff(_, { patches }, context) {
-    var _a, _b, _c;
     const { tx, domain, user } = context.state;
     let results = [];
     const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
@@ -18,25 +17,35 @@ async function updateMultipleOrganizationStaff(_, { patches }, context) {
         for (let i = 0; i < _createRecords.length; i++) {
             const newRecord = _createRecords[i];
             const organization = await tx.getRepository(entities_1.Organization).findOneOrFail({
-                where: { id: (_a = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _a === void 0 ? void 0 : _a.id }
+                where: { id: newRecord?.organization?.id }
             });
-            const result = await organizationStaffRepo.save(Object.assign(Object.assign({}, newRecord), { organization,
-                domain, status: constants_1.ORGANIZATION_STAFF_STATUS.ACTIVE, creator: user, updater: user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
+            const result = await organizationStaffRepo.save({
+                ...newRecord,
+                organization,
+                domain,
+                status: constants_1.ORGANIZATION_STAFF_STATUS.ACTIVE,
+                creator: user,
+                updater: user
+            });
+            results.push({ ...result, cuFlag: '+' });
         }
     }
     if (_updateRecords.length > 0) {
         for (let i = 0; i < _updateRecords.length; i++) {
             let newRecord = _updateRecords[i];
             const organizationStaff = await organizationStaffRepo.findOneBy({ id: newRecord.id });
-            if ((_b = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _b === void 0 ? void 0 : _b.id) {
+            if (newRecord?.organization?.id) {
                 const organization = await tx.getRepository(entities_1.Organization).findOneOrFail({
-                    where: { id: (_c = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _c === void 0 ? void 0 : _c.id }
+                    where: { id: newRecord?.organization?.id }
                 });
-                newRecord = Object.assign(Object.assign({}, newRecord), { organization });
+                newRecord = { ...newRecord, organization };
             }
-            const result = await organizationStaffRepo.save(Object.assign(Object.assign(Object.assign({}, organizationStaff), newRecord), { updater: user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+            const result = await organizationStaffRepo.save({
+                ...organizationStaff,
+                ...newRecord,
+                updater: user
+            });
+            results.push({ ...result, cuFlag: 'M' });
         }
     }
     return results;

package/dist-server/graphql/resolvers/organization-staff/update-multiple-organization-staff.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-multiple-organization-staff.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/update-multiple-organization-staff.ts"],"names":[],"mappings":";;;AAOA,0EAoDC;AA3DD,kDAA8D;AAC9D,gDAAmE;AAEtD,QAAA,uCAAuC,GAAG;IACrD,+BAA+B;CAChC,CAAA;AAEM,KAAK,UAAU,+BAA+B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAwB;;IACjG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,qBAAqB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAA;IAEjE,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAEnC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;gBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,~~MAAA,~~SAAS,~~aAAT~~,~~SAAS,uBAAT,SAAS,CAAE,~~YAAY,~~0CAAE~~,EAAE,EAAE;aAC3C,CAAC,CAAA;YAEF,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,~~iCAC1C~~,SAAS,~~KACZ,~~YAAY;gBACZ,MAAM,~~EACN,~~MAAM,EAAE,qCAAyB,CAAC,MAAM,~~EACxC,~~OAAO,EAAE,IAAI,~~EACb,~~OAAO,EAAE,IAAI,~~IACb~~,CAAA;YAEF,OAAO,CAAC,IAAI,~~iCAAM~~,MAAM,~~KAAE~~,MAAM,EAAE,GAAG,~~IAAG~~,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;YAErF,IAAI,~~MAAA,~~SAAS,~~aAAT~~,~~SAAS,uBAAT,SAAS,CAAE,~~YAAY,~~0CAAE~~,EAAE,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;oBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,~~MAAA,~~SAAS,~~aAAT~~,~~SAAS,uBAAT,SAAS,CAAE,~~YAAY,~~0CAAE~~,EAAE,EAAE;iBAC3C,CAAC,CAAA;gBACF,SAAS,~~mCAAQ~~,SAAS,~~KAAE~~,YAAY,~~GAAE~~,CAAA;YAC5C,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI~~,+CAC1C~~,iBAAiB,~~GACjB~~,SAAS,~~KACZ,~~OAAO,EAAE,IAAI,~~IACb~~,CAAA;YAEF,OAAO,CAAC,IAAI,~~iCAAM~~,MAAM,~~KAAE~~,MAAM,EAAE,GAAG,~~IAAG~~,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import { ORGANIZATION_STAFF_STATUS } from '../../../constants'\nimport { Organization, OrganizationStaff } from '../../../entities'\n\nexport const updateMultipleOrganizationStaffResolver = {\n updateMultipleOrganizationStaff\n}\n\nexport async function updateMultipleOrganizationStaff(_: any, { patches }, context: ResolverContext) {\n const { tx, domain, user } = context.state\n\n let results = []\n const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n const organizationStaffRepo = tx.getRepository(OrganizationStaff)\n\n if (_createRecords.length > 0) {\n for (let i = 0; i < _createRecords.length; i++) {\n const newRecord = _createRecords[i]\n\n const organization = await tx.getRepository(Organization).findOneOrFail({\n where: { id: newRecord?.organization?.id }\n })\n\n const result = await organizationStaffRepo.save({\n ...newRecord,\n organization,\n domain,\n status: ORGANIZATION_STAFF_STATUS.ACTIVE,\n creator: user,\n updater: user\n })\n\n results.push({ ...result, cuFlag: '+' })\n }\n }\n\n if (_updateRecords.length > 0) {\n for (let i = 0; i < _updateRecords.length; i++) {\n let newRecord = _updateRecords[i]\n const organizationStaff = await organizationStaffRepo.findOneBy({ id: newRecord.id })\n\n if (newRecord?.organization?.id) {\n const organization = await tx.getRepository(Organization).findOneOrFail({\n where: { id: newRecord?.organization?.id }\n })\n newRecord = { ...newRecord, organization }\n }\n\n const result = await organizationStaffRepo.save({\n ...organizationStaff,\n ...newRecord,\n updater: user\n })\n\n results.push({ ...result, cuFlag: 'M' })\n }\n }\n\n return results\n}\n"]}
1	+ {"version":3,"file":"update-multiple-organization-staff.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/organization-staff/update-multiple-organization-staff.ts"],"names":[],"mappings":";;;AAOA,0EAoDC;AA3DD,kDAA8D;AAC9D,gDAAmE;AAEtD,QAAA,uCAAuC,GAAG;IACrD,+BAA+B;CAChC,CAAA;AAEM,KAAK,UAAU,+BAA+B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAwB;IACjG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,qBAAqB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAA;IAEjE,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAEnC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;gBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE;aAC3C,CAAC,CAAA;YAEF,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC;gBAC9C,GAAG,SAAS;gBACZ,YAAY;gBACZ,MAAM;gBACN,MAAM,EAAE,qCAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;YAErF,IAAI,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;oBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE;iBAC3C,CAAC,CAAA;gBACF,SAAS,GAAG,EAAE,GAAG,SAAS,EAAE,YAAY,EAAE,CAAA;YAC5C,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC;gBAC9C,GAAG,iBAAiB;gBACpB,GAAG,SAAS;gBACZ,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import { ORGANIZATION_STAFF_STATUS } from '../../../constants'\nimport { Organization, OrganizationStaff } from '../../../entities'\n\nexport const updateMultipleOrganizationStaffResolver = {\n updateMultipleOrganizationStaff\n}\n\nexport async function updateMultipleOrganizationStaff(_: any, { patches }, context: ResolverContext) {\n const { tx, domain, user } = context.state\n\n let results = []\n const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n const organizationStaffRepo = tx.getRepository(OrganizationStaff)\n\n if (_createRecords.length > 0) {\n for (let i = 0; i < _createRecords.length; i++) {\n const newRecord = _createRecords[i]\n\n const organization = await tx.getRepository(Organization).findOneOrFail({\n where: { id: newRecord?.organization?.id }\n })\n\n const result = await organizationStaffRepo.save({\n ...newRecord,\n organization,\n domain,\n status: ORGANIZATION_STAFF_STATUS.ACTIVE,\n creator: user,\n updater: user\n })\n\n results.push({ ...result, cuFlag: '+' })\n }\n }\n\n if (_updateRecords.length > 0) {\n for (let i = 0; i < _updateRecords.length; i++) {\n let newRecord = _updateRecords[i]\n const organizationStaff = await organizationStaffRepo.findOneBy({ id: newRecord.id })\n\n if (newRecord?.organization?.id) {\n const organization = await tx.getRepository(Organization).findOneOrFail({\n where: { id: newRecord?.organization?.id }\n })\n newRecord = { ...newRecord, organization }\n }\n\n const result = await organizationStaffRepo.save({\n ...organizationStaff,\n ...newRecord,\n updater: user\n })\n\n results.push({ ...result, cuFlag: 'M' })\n }\n }\n\n return results\n}\n"]}

package/dist-server/graphql/resolvers/plantation-inventory/plantation-inventory-query.js CHANGED Viewed

@@ -27,7 +27,11 @@ exports.Query = {
             .leftJoinAndSelect('PlantationInventory.updater', 'Updater')
             .getManyAndCount();
         items = items.map((item) => {
-            return Object.assign(Object.assign({}, item), { rampName: (item === null || item === void 0 ? void 0 : item.ramp) ? item.ramp.name : null, rampId: (item === null || item === void 0 ? void 0 : item.ramp) ? item.ramp.id : null });
+            return {
+                ...item,
+                rampName: item?.ramp ? item.ramp.name : null,
+                rampId: item?.ramp ? item.ramp.id : null
+            };
         });
         return { items, total };
     }