@steedos-labs/content-compliance 0.7.3 → 0.7.5

package/lib/methods/approval_engine.js

@@ -499,20 +499,20 @@ var updateUserStepStatus = function (ctx, materialApproval, _a) {
     });
 };
 var updateApproveFieldStatus = function (ctx, recordId, approveField, approveFieldValue) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var userId, set, approvalNew, approvals, index;
-    var _a;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.label) {
+    var userId, set, approvalNew, approvals, index, postponedUsers, postponeRecords, postponeRecords_1, postponeRecords_1_1, pr, prUserIds, e_3_1;
+    var _a, e_3, _b;
+    return tslib_1.__generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 userId = ctx.meta.user.userId;
-                if (!approveField) return [3, 4];
+                if (!approveField) return [3, 13];
                 set = (_a = {},
                     _a[approveField] = approveFieldValue,
                     _a);
-                if (!userId) return [3, 2];
+                if (!userId) return [3, 11];
                 return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
             case 1:
-                approvalNew = _b.sent();
+                approvalNew = _c.sent();
                 approvals = approvalNew.person_pending_approve || [];
                 index = (0, lodash_1.findIndex)(approvals, function (item) { return item === userId; });
                 if (index !== -1) {
@@ -522,22 +522,66 @@ var updateApproveFieldStatus = function (ctx, recordId, approveField, approveFie
                 set.$push = {
                     person_approved: userId
                 };
-                _b.label = 2;
+                postponedUsers = approvalNew.review_postponed_users || [];
+                if (!postponedUsers.includes(userId)) return [3, 11];
+                set.review_postponed_users = postponedUsers.filter(function (uid) { return uid !== userId; });
+                return [4, ctx.getObject('pepsico_review_postpone').directFind({
+                        filters: [
+                            ['pepsico_material_approval', '=', recordId],
+                            ['notification_sent', '=', false],
+                            ['is_marker', '!=', true]
+                        ]
+                    })];
             case 2:
+                postponeRecords = _c.sent();
+                _c.label = 3;
+            case 3:
+                _c.trys.push([3, 8, 9, 10]);
+                postponeRecords_1 = tslib_1.__values(postponeRecords), postponeRecords_1_1 = postponeRecords_1.next();
+                _c.label = 4;
+            case 4:
+                if (!!postponeRecords_1_1.done) return [3, 7];
+                pr = postponeRecords_1_1.value;
+                prUserIds = pr.postponed_user_ids ? pr.postponed_user_ids.split(',').filter(Boolean) : [];
+                if (!prUserIds.includes(userId)) return [3, 6];
+                return [4, ctx.getObject('pepsico_review_postpone').directUpdate(pr._id, {
+                        notification_sent: true
+                    })];
+            case 5:
+                _c.sent();
+                _c.label = 6;
+            case 6:
+                postponeRecords_1_1 = postponeRecords_1.next();
+                return [3, 4];
+            case 7: return [3, 10];
+            case 8:
+                e_3_1 = _c.sent();
+                e_3 = { error: e_3_1 };
+                return [3, 10];
+            case 9:
+                try {
+                    if (postponeRecords_1_1 && !postponeRecords_1_1.done && (_b = postponeRecords_1.return)) _b.call(postponeRecords_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+                return [7];
+            case 10:
+                console.log("[updateApproveFieldStatus] \u5EF6\u540E\u5BA1\u6838\u4EBA\u63D0\u524D\u5BA1\u6838\uFF0C\u5DF2\u6E05\u7406 review_postponed_users: ".concat(userId));
+                _c.label = 11;
+            case 11:
                 console.log('[updateApproveFieldStatus]', JSON.stringify({ recordId: recordId, set: set }));
                 return [4, ctx.getObject('pepsico_material_approval').update(recordId, set)];
-            case 3:
-                _b.sent();
-                _b.label = 4;
-            case 4: return [2];
+            case 12:
+                _c.sent();
+                _c.label = 13;
+            case 13: return [2];
         }
     });
 }); };
 var changeApprovalProcess = function (ctx, materialApproval, _a) {
     var nextStep = _a.nextStep, nextApprovers = _a.nextApprovers, description = _a.description;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var user, count, now, sUsers, _b, nextApprovers_1, nextApprovers_1_1, nextApprover, _c, _d, userId, spaceUsers, e_3_1, e_4_1;
-        var e_4, _e, e_3, _f, _g;
+        var user, count, now, sUsers, _b, nextApprovers_1, nextApprovers_1_1, nextApprover, _c, _d, userId, spaceUsers, e_4_1, e_5_1;
+        var e_5, _e, e_4, _f, _g;
         return tslib_1.__generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -594,7 +638,7 @@ var changeApprovalProcess = function (ctx, materialApproval, _a) {
                     _h.label = 6;
                 case 6:
                     _h.trys.push([6, 12, 13, 14]);
-                    _c = (e_3 = void 0, tslib_1.__values(nextApprover.userIds)), _d = _c.next();
+                    _c = (e_4 = void 0, tslib_1.__values(nextApprover.userIds)), _d = _c.next();
                     _h.label = 7;
                 case 7:
                     if (!!_d.done) return [3, 11];
@@ -624,14 +668,14 @@ var changeApprovalProcess = function (ctx, materialApproval, _a) {
                     return [3, 7];
                 case 11: return [3, 14];
                 case 12:
-                    e_3_1 = _h.sent();
-                    e_3 = { error: e_3_1 };
+                    e_4_1 = _h.sent();
+                    e_4 = { error: e_4_1 };
                     return [3, 14];
                 case 13:
                     try {
                         if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_4) throw e_4.error; }
                     return [7];
                 case 14:
                     if (!nextApprover.type) return [3, 16];
@@ -646,14 +690,14 @@ var changeApprovalProcess = function (ctx, materialApproval, _a) {
                     return [3, 5];
                 case 17: return [3, 20];
                 case 18:
-                    e_4_1 = _h.sent();
-                    e_4 = { error: e_4_1 };
+                    e_5_1 = _h.sent();
+                    e_5 = { error: e_5_1 };
                     return [3, 20];
                 case 19:
                     try {
                         if (nextApprovers_1_1 && !nextApprovers_1_1.done && (_e = nextApprovers_1.return)) _e.call(nextApprovers_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                     return [7];
                 case 20: return [3, 24];
                 case 21: return [4, ctx.getObject('pepsico_approval_process').insert({
@@ -725,8 +769,8 @@ var PRE_TO_FORMAL_MAPPING = {
     'pre_approval_status': { reviewerField: 'reviewer', type: consts_1.ProcessApprovalType.guding, statusField: 'approval_status' },
 };
 var addFormalReviewerAfterPreApproval = function (ctx, recordId, approveField, materialApproval) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var info, formalStatus, reviewerIds, userIds, agents, user, _a, _b, userId, spaceUsers, e_5_1, currentApproval, pendingApprove, newPending;
-    var e_5, _c, _d, _e, _f;
+    var info, formalStatus, reviewerIds, userIds, agents, user, _a, _b, userId, spaceUsers, e_6_1, currentApproval, pendingApprove, newPending;
+    var e_6, _c, _d, _e, _f;
     return tslib_1.__generator(this, function (_g) {
         switch (_g.label) {
             case 0:
@@ -779,14 +823,14 @@ var addFormalReviewerAfterPreApproval = function (ctx, recordId, approveField, m
                 return [3, 3];
             case 7: return [3, 10];
             case 8:
-                e_5_1 = _g.sent();
-                e_5 = { error: e_5_1 };
+                e_6_1 = _g.sent();
+                e_6 = { error: e_6_1 };
                 return [3, 10];
             case 9:
                 try {
                     if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
                 return [7];
             case 10: return [4, ctx.getObject('pepsico_material_approval').directUpdate(materialApproval._id, (_d = {},
                     _d["handler_".concat((0, lodash_1.toLower)(info.type))] = agents.userIds,
@@ -847,8 +891,8 @@ var hasNonPreReviewDepartments = function (materialApproval) {
 };
 exports.hasNonPreReviewDepartments = hasNonPreReviewDepartments;
 var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var actionLabel, user, record, nextStep, skipApprover, nextApprovers, _nextApprovers, nextApprovers_2, nextApprovers_2_1, reviewer, fieldName, status, e_6_1, nextApproversUserIds_1, nextApproversClientUserIds_1, setDoc, nextApprovers_3, nextApprovers_3_1, nextApprover, e_7_1, setDoc_1, postponedUserIds_1, now, visibleAfter, pastPostponeRecords, postponedDepts, _loop_1, nextApprovers_4, nextApprovers_4_1, reviewer, e_8_1, currentRecord, currentPostponed, newPostponed, notifyUserIds, initiator, materialOwner, error_1;
-    var e_6, _a, _b, _c, e_7, _d, e_8, _e;
+    var actionLabel, user, record, nextStep, skipApprover, nextApprovers, _nextApprovers, nextApprovers_2, nextApprovers_2_1, reviewer, fieldName, status, e_7_1, nextApproversUserIds_1, nextApproversClientUserIds_1, setDoc, nextApprovers_3, nextApprovers_3_1, nextApprover, e_8_1, setDoc_1, postponedUserIds_1, now, visibleAfter, pastPostponeRecords, postponedDepts, _loop_1, nextApprovers_4, nextApprovers_4_1, reviewer, e_9_1, currentRecord, currentPostponed, newPostponed, currentMarkerUsers, newMarkerUsers, notifyUserIds, initiator, materialOwner, error_1;
+    var e_7, _a, _b, _c, e_8, _d, e_9, _e;
     return tslib_1.__generator(this, function (_f) {
         switch (_f.label) {
             case 0:
@@ -931,14 +975,14 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 return [3, 11];
             case 17: return [3, 20];
             case 18:
-                e_6_1 = _f.sent();
-                e_6 = { error: e_6_1 };
+                e_7_1 = _f.sent();
+                e_7 = { error: e_7_1 };
                 return [3, 20];
             case 19:
                 try {
                     if (nextApprovers_2_1 && !nextApprovers_2_1.done && (_a = nextApprovers_2.return)) _a.call(nextApprovers_2);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_7) throw e_7.error; }
                 return [7];
             case 20:
                 if (!(_nextApprovers.length > 0)) return [3, 21];
@@ -1187,14 +1231,14 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 return [3, 34];
             case 68: return [3, 71];
             case 69:
-                e_7_1 = _f.sent();
-                e_7 = { error: e_7_1 };
+                e_8_1 = _f.sent();
+                e_8 = { error: e_8_1 };
                 return [3, 71];
             case 70:
                 try {
                     if (nextApprovers_3_1 && !nextApprovers_3_1.done && (_d = nextApprovers_3.return)) _d.call(nextApprovers_3);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_8) throw e_8.error; }
                 return [7];
             case 71:
                 if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 73];
@@ -1251,8 +1295,8 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 if (!(pastPostponeRecords && pastPostponeRecords.length > 0)) return [3, 91];
                 postponedDepts = new Set(pastPostponeRecords.map(function (r) { return r.department_type; }));
                 _loop_1 = function (reviewer) {
-                    var deptUserIds, deptMarkers, deptMarkers_1, deptMarkers_1_1, marker, e_9_1;
-                    var e_9, _g;
+                    var deptUserIds, deptMarkers, deptMarkers_1, deptMarkers_1_1, marker, e_10_1;
+                    var e_10, _g;
                     return tslib_1.__generator(this, function (_h) {
                         switch (_h.label) {
                             case 0:
@@ -1263,7 +1307,7 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                                 _h.label = 1;
                             case 1:
                                 _h.trys.push([1, 6, 7, 8]);
-                                deptMarkers_1 = (e_9 = void 0, tslib_1.__values(deptMarkers)), deptMarkers_1_1 = deptMarkers_1.next();
+                                deptMarkers_1 = (e_10 = void 0, tslib_1.__values(deptMarkers)), deptMarkers_1_1 = deptMarkers_1.next();
                                 _h.label = 2;
                             case 2:
                                 if (!!deptMarkers_1_1.done) return [3, 5];
@@ -1284,14 +1328,14 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                                 return [3, 2];
                             case 5: return [3, 8];
                             case 6:
-                                e_9_1 = _h.sent();
-                                e_9 = { error: e_9_1 };
+                                e_10_1 = _h.sent();
+                                e_10 = { error: e_10_1 };
                                 return [3, 8];
                             case 7:
                                 try {
                                     if (deptMarkers_1_1 && !deptMarkers_1_1.done && (_g = deptMarkers_1.return)) _g.call(deptMarkers_1);
                                 }
-                                finally { if (e_9) throw e_9.error; }
+                                finally { if (e_10) throw e_10.error; }
                                 return [7];
                             case 8:
                                 postponedUserIds_1 = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(postponedUserIds_1, deptUserIds)));
@@ -1316,14 +1360,14 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 return [3, 82];
             case 85: return [3, 88];
             case 86:
-                e_8_1 = _f.sent();
-                e_8 = { error: e_8_1 };
+                e_9_1 = _f.sent();
+                e_9 = { error: e_9_1 };
                 return [3, 88];
             case 87:
                 try {
                     if (nextApprovers_4_1 && !nextApprovers_4_1.done && (_e = nextApprovers_4.return)) _e.call(nextApprovers_4);
                 }
-                finally { if (e_8) throw e_8.error; }
+                finally { if (e_9) throw e_9.error; }
                 return [7];
             case 88:
                 if (!(postponedUserIds_1.length > 0)) return [3, 91];
@@ -1332,8 +1376,11 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 currentRecord = _f.sent();
                 currentPostponed = currentRecord.review_postponed_users || [];
                 newPostponed = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(currentPostponed, postponedUserIds_1)));
+                currentMarkerUsers = currentRecord.postpone_marker_users || [];
+                newMarkerUsers = currentMarkerUsers.filter(function (uid) { return !postponedUserIds_1.includes(uid); });
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
-                        review_postponed_users: newPostponed
+                        review_postponed_users: newPostponed,
+                        postpone_marker_users: newMarkerUsers
                     })];
             case 90:
                 _f.sent();
@@ -1366,8 +1413,8 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
 }); };
 exports.advanceApproval = advanceApproval;
 var terminate = function (ctx, recordId, description) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var user, record, records, records_1, records_1_1, process_2, e_10_1;
-    var e_10, _a;
+    var user, record, records, records_1, records_1_1, process_2, e_11_1;
+    var e_11, _a;
     return tslib_1.__generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -1416,14 +1463,14 @@ var terminate = function (ctx, recordId, description) { return tslib_1.__awaiter
                 return [3, 5];
             case 8: return [3, 11];
             case 9:
-                e_10_1 = _b.sent();
-                e_10 = { error: e_10_1 };
+                e_11_1 = _b.sent();
+                e_11 = { error: e_11_1 };
                 return [3, 11];
             case 10:
                 try {
                     if (records_1_1 && !records_1_1.done && (_a = records_1.return)) _a.call(records_1);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_11) throw e_11.error; }
                 return [7];
             case 11: return [4, ctx.getObject('pepsico_material_approval').update(recordId, {
                     current_step: consts_1.Step.conclusion,
@@ -1779,8 +1826,8 @@ var submitPreReviewContent = function (ctx, recordId, currentStepApprovalStatus)
 exports.submitPreReviewContent = submitPreReviewContent;
 var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var approvalNew, user, allow, aProcess, aProcess_1, aProcess_1_1, item, e_11_1, approvalType, allTrue1, allTrue, spaceUsers, owner, materials, pendingXmlToWordMaterials, pendingUploadMaterials;
-        var e_11, _a;
+        var approvalNew, user, allow, aProcess, aProcess_1, aProcess_1_1, item, e_12_1, approvalType, allTrue1, allTrue, spaceUsers, owner, materials, pendingXmlToWordMaterials, pendingUploadMaterials;
+        var e_12, _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
@@ -1838,14 +1885,14 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                     return [3, 4];
                 case 7: return [3, 10];
                 case 8:
-                    e_11_1 = _b.sent();
-                    e_11 = { error: e_11_1 };
+                    e_12_1 = _b.sent();
+                    e_12 = { error: e_12_1 };
                     return [3, 10];
                 case 9:
                     try {
                         if (aProcess_1_1 && !aProcess_1_1.done && (_a = aProcess_1.return)) _a.call(aProcess_1);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_12) throw e_12.error; }
                     return [7];
                 case 10:
                     if (allow != true && approvalNew.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalNew.person_pending_approve, user.userId)) {
@@ -2009,8 +2056,8 @@ var TYPE_TO_REVIEWER_FIELD = (_a = {},
     _a);
 var postponeReview = function (ctx, recordId, data) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var user, record, progessRecords, userProcessRecords, departmentType, reviewerField, deptUserIds, val, now, unactivatedMarkers, latestMarker, _a, _b, marker, e_12_1;
-        var e_12, _c;
+        var user, record, progessRecords, userProcessRecords, departmentType, reviewerField, deptUserIds, val, now, unactivatedMarkers, latestMarker, _a, _b, marker, e_13_1;
+        var e_13, _c;
         return tslib_1.__generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -2112,14 +2159,14 @@ var postponeReview = function (ctx, recordId, data) {
                     return [3, 7];
                 case 10: return [3, 13];
                 case 11:
-                    e_12_1 = _d.sent();
-                    e_12 = { error: e_12_1 };
+                    e_13_1 = _d.sent();
+                    e_13 = { error: e_13_1 };
                     return [3, 13];
                 case 12:
                     try {
                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_13) throw e_13.error; }
                     return [7];
                 case 13: return [3, 16];
                 case 14: return [4, ctx.getObject('pepsico_review_postpone').insert({
@@ -2143,6 +2190,13 @@ var postponeReview = function (ctx, recordId, data) {
                     _d.label = 16;
                 case 16:
                     console.log("[postponeReview] recordId=".concat(recordId, ", departmentType=").concat(departmentType, ", deptUserIds=").concat(deptUserIds, ", markedForNextRound=true"));
+                    return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
+                            $push: {
+                                postpone_marker_users: user.userId
+                            }
+                        })];
+                case 17:
+                    _d.sent();
                     return [2, {}];
             }
         });