@steedos-labs/content-compliance-bev 0.0.3 → 0.0.5

package/lib/methods/approval_engine.js

@@ -604,7 +604,7 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
     return tslib_1.__generator(this, function (_e) {
         switch (_e.label) {
             case 0:
-                _e.trys.push([0, 62, , 63]);
+                _e.trys.push([0, 67, , 68]);
                 actionLabel = '请查看';
                 user = ctx.meta.user;
                 return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
@@ -622,12 +622,14 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                 skipApprover = _e.sent();
                 if (!(nextStep === consts_1.Step.conclusion && skipApprover)) return [3, 8];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(record._id, {
-                        is_skip_approver: true
+                        is_skip_approver: true,
+                        approved_time: new Date()
                     })];
             case 5:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
-                        is_skip_approver: true
+                        is_skip_approver: true,
+                        approved_time: new Date()
                     })];
             case 6:
                 _e.sent();
@@ -635,69 +637,83 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
             case 7:
                 _e.sent();
                 _e.label = 8;
-            case 8: return [4, getNextApprovers(ctx, record, nextStep)];
+            case 8:
+                if (!(nextStep === consts_1.Step.conclusion && record.current_step === consts_1.Step.draft)) return [3, 11];
+                if (!_.includes(const_1.DCO_TYPES, record.classification)) return [3, 11];
+                return [4, ctx.getObject('pepsico_material_approval').directUpdate(record._id, {
+                        approved_time: new Date()
+                    })];
             case 9:
+                _e.sent();
+                return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
+                        approved_time: new Date()
+                    })];
+            case 10:
+                _e.sent();
+                _e.label = 11;
+            case 11: return [4, getNextApprovers(ctx, record, nextStep)];
+            case 12:
                 nextApprovers = _e.sent();
-                if (!(record.current_step === consts_1.Step.submitter_revisions && (nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review))) return [3, 23];
+                if (!(record.current_step === consts_1.Step.submitter_revisions && (nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review))) return [3, 26];
                 _nextApprovers = [];
-                _e.label = 10;
-            case 10:
-                _e.trys.push([10, 18, 19, 20]);
+                _e.label = 13;
+            case 13:
+                _e.trys.push([13, 21, 22, 23]);
                 nextApprovers_2 = tslib_1.__values(nextApprovers), nextApprovers_2_1 = nextApprovers_2.next();
-                _e.label = 11;
-            case 11:
-                if (!!nextApprovers_2_1.done) return [3, 17];
+                _e.label = 14;
+            case 14:
+                if (!!nextApprovers_2_1.done) return [3, 20];
                 reviewer = nextApprovers_2_1.value;
                 fieldName = (0, material_1.getApproverFieldByType)(reviewer.type);
                 console.log("getApproverFieldByType", reviewer.type, fieldName);
                 if (!fieldName) {
-                    return [3, 16];
+                    return [3, 19];
                 }
                 return [4, (0, material_1.getUserReviewedAllMaterialsStatus)(ctx, record._id, fieldName)];
-            case 12:
+            case 15:
                 status = _e.sent();
                 console.log("getUserReviewedAllMaterialsStatus", record._id, fieldName, status);
-                if (!(status === consts_1.ApprovalStatus.approved)) return [3, 14];
+                if (!(status === consts_1.ApprovalStatus.approved)) return [3, 17];
                 console.log("[advanceApproval] \u81EA\u52A8\u66F4\u65B0\u5BA1\u6279\u5355\u4E0A\u7684\u72B6\u6001\u5B57\u6BB5", recordId, (_b = {},
                     _b[fieldName] = consts_1.ApprovalStatus.approved,
                     _b));
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, (_c = {},
                         _c[fieldName] = true,
                         _c))];
-            case 13:
+            case 16:
                 _e.sent();
-                return [3, 15];
-            case 14:
+                return [3, 18];
+            case 17:
                 _nextApprovers.push(reviewer);
-                _e.label = 15;
-            case 15:
+                _e.label = 18;
+            case 18:
                 ;
-                _e.label = 16;
-            case 16:
+                _e.label = 19;
+            case 19:
                 nextApprovers_2_1 = nextApprovers_2.next();
-                return [3, 11];
-            case 17: return [3, 20];
-            case 18:
+                return [3, 14];
+            case 20: return [3, 23];
+            case 21:
                 e_5_1 = _e.sent();
                 e_5 = { error: e_5_1 };
-                return [3, 20];
-            case 19:
+                return [3, 23];
+            case 22:
                 try {
                     if (nextApprovers_2_1 && !nextApprovers_2_1.done && (_a = nextApprovers_2.return)) _a.call(nextApprovers_2);
                 }
                 finally { if (e_5) throw e_5.error; }
                 return [7];
-            case 20:
-                if (!(_nextApprovers.length > 0)) return [3, 21];
+            case 23:
+                if (!(_nextApprovers.length > 0)) return [3, 24];
                 nextApprovers = _nextApprovers;
-                return [3, 23];
-            case 21:
+                return [3, 26];
+            case 24:
                 nextStep = consts_1.Step.awaiting_deployment;
                 return [4, getNextApprovers(ctx, record, nextStep)];
-            case 22:
+            case 25:
                 nextApprovers = _e.sent();
-                _e.label = 23;
-            case 23:
+                _e.label = 26;
+            case 26:
                 console.log("[advanceApproval] currentStepApprovalStatus:", currentStepApprovalStatus, " nextStep:", nextStep, " nextApprovers:", nextApprovers);
                 nextApproversUserIds_1 = [];
                 nextApproversClientUserIds_1 = [];
@@ -718,15 +734,15 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                         }
                     }
                 };
-                if (!(record.current_step === consts_1.Step.draft)) return [3, 25];
+                if (!(record.current_step === consts_1.Step.draft)) return [3, 28];
                 setDoc.draft_submitted = new Date();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
                         draft_submitted: setDoc.draft_submitted
                     })];
-            case 24:
+            case 27:
                 _e.sent();
-                _e.label = 25;
-            case 25:
+                _e.label = 28;
+            case 28:
                 if (record.current_step === consts_1.Step.ai_review) {
                     setDoc.ai_reviewed_date = new Date();
                 }
@@ -743,150 +759,161 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                     setDoc.submitter_revision_date = new Date();
                 }
                 return [4, ctx.getObject('pepsico_material_approval').update(recordId, setDoc)];
-            case 26:
+            case 29:
                 _e.sent();
                 return [4, changeApprovalProcess(ctx, record, {
                         nextStep: nextStep,
                         nextApprovers: nextApprovers,
                         description: ""
                     })];
-            case 27:
+            case 30:
                 _e.sent();
-                if (!(nextStep === consts_1.Step.ai_review)) return [3, 29];
+                if (!(false && nextStep === consts_1.Step.ai_review)) return [3, 32];
                 console.time('callAIReview: ' + recordId);
                 return [4, (0, AI_1.callAIReview)(ctx, recordId)];
-            case 28:
+            case 31:
                 _e.sent();
                 console.timeEnd('callAIReview: ' + recordId);
-                _e.label = 29;
-            case 29:
-                _e.trys.push([29, 50, 51, 52]);
+                _e.label = 32;
+            case 32:
+                _e.trys.push([32, 53, 54, 55]);
                 nextApprovers_3 = tslib_1.__values(nextApprovers), nextApprovers_3_1 = nextApprovers_3.next();
-                _e.label = 30;
-            case 30:
-                if (!!nextApprovers_3_1.done) return [3, 49];
+                _e.label = 33;
+            case 33:
+                if (!!nextApprovers_3_1.done) return [3, 52];
                 nextApprover = nextApprovers_3_1.value;
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.CA)) return [3, 33];
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.CA)) return [3, 36];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         ca_approval_status: ''
                     })];
-            case 31:
+            case 34:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['ca_approval_status', '=', false]], {
                         ca_approval_status: ''
                     })];
-            case 32:
+            case 35:
                 _e.sent();
-                _e.label = 33;
-            case 33:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.Legal)) return [3, 36];
+                _e.label = 36;
+            case 36:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.Legal)) return [3, 39];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         legal_approval_status: ''
                     })];
-            case 34:
+            case 37:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['legal_approval_status', '=', false]], {
                         legal_approval_status: ''
                     })];
-            case 35:
+            case 38:
                 _e.sent();
-                _e.label = 36;
-            case 36:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.NS)) return [3, 39];
+                _e.label = 39;
+            case 39:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.NS)) return [3, 42];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         ns_approval_status: ''
                     })];
-            case 37:
+            case 40:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['ns_approval_status', '=', false]], {
                         ns_approval_status: ''
                     })];
-            case 38:
+            case 41:
                 _e.sent();
-                _e.label = 39;
-            case 39:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.SRA)) return [3, 42];
+                _e.label = 42;
+            case 42:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.SRA)) return [3, 45];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         sra_approval_status: ''
                     })];
-            case 40:
+            case 43:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['sra_approval_status', '=', false]], {
                         sra_approval_status: ''
                     })];
-            case 41:
+            case 44:
                 _e.sent();
-                _e.label = 42;
-            case 42:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.guding)) return [3, 45];
+                _e.label = 45;
+            case 45:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.guding)) return [3, 48];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         approval_status: ''
                     })];
-            case 43:
+            case 46:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['approval_status', '=', false]], {
                         approval_status: ''
                     })];
-            case 44:
+            case 47:
                 _e.sent();
-                _e.label = 45;
-            case 45:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.Kids)) return [3, 48];
+                _e.label = 48;
+            case 48:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.Kids)) return [3, 51];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         kids_approval_status: ''
                     })];
-            case 46:
+            case 49:
                 _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['kids_approval_status', '=', false]], {
                         kids_approval_status: ''
                     })];
-            case 47:
+            case 50:
                 _e.sent();
-                _e.label = 48;
-            case 48:
+                _e.label = 51;
+            case 51:
                 nextApprovers_3_1 = nextApprovers_3.next();
-                return [3, 30];
-            case 49: return [3, 52];
-            case 50:
+                return [3, 33];
+            case 52: return [3, 55];
+            case 53:
                 e_6_1 = _e.sent();
                 e_6 = { error: e_6_1 };
-                return [3, 52];
-            case 51:
+                return [3, 55];
+            case 54:
                 try {
                     if (nextApprovers_3_1 && !nextApprovers_3_1.done && (_d = nextApprovers_3.return)) _d.call(nextApprovers_3);
                 }
                 finally { if (e_6) throw e_6.error; }
                 return [7];
-            case 52:
-                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 54];
+            case 55:
+                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 57];
                 return [4, setPersonView(ctx, record)];
-            case 53:
+            case 56:
                 _e.sent();
-                _e.label = 54;
-            case 54:
-                if (!(record.current_step === consts_1.Step.departmental_review || record.current_step === consts_1.Step.personnel_review)) return [3, 56];
+                _e.label = 57;
+            case 57:
+                if (!(record.current_step === consts_1.Step.departmental_review || record.current_step === consts_1.Step.personnel_review)) return [3, 61];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         materials_remove_share_link_from_onedrive_status: 'pending'
                     })];
-            case 55:
+            case 58:
                 _e.sent();
-                _e.label = 56;
-            case 56:
-                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 58];
+                if (!(nextStep != consts_1.Step.submitter_revisions)) return [3, 61];
+                return [4, ctx.getObject('pepsico_material_approval').directUpdate(record._id, {
+                        approved_time: new Date()
+                    })];
+            case 59:
+                _e.sent();
+                return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
+                        approved_time: new Date()
+                    })];
+            case 60:
+                _e.sent();
+                _e.label = 61;
+            case 61:
+                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 63];
                 return [4, pendingDeployment(ctx, recordId)];
-            case 57:
+            case 62:
                 _e.sent();
-                _e.label = 58;
-            case 58:
-                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 60];
+                _e.label = 63;
+            case 63:
+                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 65];
                 setDoc_1 = {
                     materials_download_from_onedrive_status: 'pending'
                 };
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, setDoc_1)];
-            case 59:
+            case 64:
                 _e.sent();
-                _e.label = 60;
-            case 60:
+                _e.label = 65;
+            case 65:
                 if (currentStepApprovalStatus === consts_1.ApprovalStatus.rejected) {
                     actionLabel = '内容审批被驳回';
                 }
@@ -898,16 +925,16 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                     actionLabel = "\u5185\u5BB9\u5BA1\u6279\u5DF2\u901A\u8FC7\u5F85\u4E0A\u7EBF";
                 }
                 return [4, (0, notification_1.sendNotifications)(ctx, record, nextApproversUserIds_1, actionLabel)];
-            case 61:
+            case 66:
                 _e.sent();
                 return [2, {}];
-            case 62:
+            case 67:
                 error_1 = _e.sent();
                 return [2, {
                         msg: error_1.message,
                         status: 500
                     }];
-            case 63: return [2];
+            case 68: return [2];
         }
     });
 }); };
@@ -1212,7 +1239,7 @@ var submitKidsContent = function (ctx, recordId, currentStepApprovalStatus) {
 exports.submitKidsContent = submitKidsContent;
 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_8_1, spaceUsers, owner, approvalType, allTrue1, allTrue, spaceUsers, owner, materials, pendingXmlToWordMaterials, pendingUploadMaterials;
+        var approvalNew, user, allow, aProcess, aProcess_1, aProcess_1_1, item, e_8_1, pepsicoMaterial, spaceUsers, owner, approvalType, allTrue1, allTrue, spaceUsers, owner, materials, pendingXmlToWordMaterials, pendingUploadMaterials;
         var e_8, _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
@@ -1284,17 +1311,23 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                     if (allow != true && approvalNew.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalNew.person_pending_approve, user.userId)) {
                         return [2, {}];
                     }
-                    if (!(approvalNew.is_external && approvalNew.current_step === consts_1.Step.draft && approvalNew.external_submitted != true)) return [3, 17];
-                    if (!(approvalNew.owner === user.userId)) return [3, 16];
+                    if (!(approvalNew.is_external && approvalNew.current_step === consts_1.Step.draft && approvalNew.external_submitted != true)) return [3, 18];
+                    if (!(approvalNew.owner === user.userId)) return [3, 17];
                     if (!approvalNew.material_owner) {
                         throw new Error('请先选择材料owner');
                     }
+                    return [4, ctx.getObject('pepsico_material').find({ filters: ['pepsico_material_approval', '=', recordId], fields: ['material'] })];
+                case 11:
+                    pepsicoMaterial = _b.sent();
+                    if (pepsicoMaterial.length === 0) {
+                        throw new Error('请先「上传审核文件」');
+                    }
                     return [4, ctx.getObject('space_users').find({
                             filters: [['email', '=', approvalNew.material_owner], ['space', '=', approvalNew.space]]
                         })];
-                case 11:
+                case 12:
                     spaceUsers = _b.sent();
-                    if (!(spaceUsers && spaceUsers.length > 0)) return [3, 14];
+                    if (!(spaceUsers && spaceUsers.length > 0)) return [3, 15];
                     owner = spaceUsers[0];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                             owner: owner.user,
@@ -1302,30 +1335,30 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                             internal_collaborator_edit: approvalNew.material_owner,
                             internal_collaborator: owner.user,
                         })];
-                case 12:
+                case 13:
                     _b.sent();
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-                case 13:
+                case 14:
                     approvalNew = _b.sent();
-                    _b.label = 14;
-                case 14: return [4, (0, notification_1.sendNotifications)(ctx, approvalNew, [approvalNew.internal_collaborator], '协助提交材料审批单')];
-                case 15:
+                    _b.label = 15;
+                case 15: return [4, (0, notification_1.sendNotifications)(ctx, approvalNew, [approvalNew.internal_collaborator], '协助提交材料审批单')];
+                case 16:
                     _b.sent();
-                    _b.label = 16;
-                case 16: return [2];
-                case 17:
-                    if (!(approvalNew.current_step === consts_1.Step.draft)) return [3, 25];
-                    return [4, getApproveType(ctx, approvalNew)];
+                    _b.label = 17;
+                case 17: return [2];
                 case 18:
+                    if (!(approvalNew.current_step === consts_1.Step.draft)) return [3, 26];
+                    return [4, getApproveType(ctx, approvalNew)];
+                case 19:
                     approvalType = _b.sent();
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalNew._id, {
                             approval_type: approvalType
                         })];
-                case 19:
+                case 20:
                     _b.sent();
-                    if (!false) return [3, 22];
+                    if (!false) return [3, 23];
                     return [4, (0, material_1.deleteBulkDocOneDriveShareLink)(ctx, recordId)];
-                case 20:
+                case 21:
                     allTrue1 = _b.sent();
                     if (allTrue1 != true) {
                         return [2, {
@@ -1335,7 +1368,7 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                             }];
                     }
                     return [4, (0, material_1.downloadBulkFromOneDriveDoc)(ctx, recordId)];
-                case 21:
+                case 22:
                     allTrue = _b.sent();
                     if (allTrue != true) {
                         return [2, {
@@ -1344,29 +1377,29 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                                 data: {}
                             }];
                     }
-                    _b.label = 22;
-                case 22:
-                    if (!(approvalNew && approvalNew.material_owner)) return [3, 25];
+                    _b.label = 23;
+                case 23:
+                    if (!(approvalNew && approvalNew.material_owner)) return [3, 26];
                     return [4, ctx.getObject('space_users').find({
                             filters: [['email', '=', approvalNew.material_owner], ['space', '=', approvalNew.space]]
                         })];
-                case 23:
+                case 24:
                     spaceUsers = _b.sent();
-                    if (!(spaceUsers && spaceUsers.length > 0)) return [3, 25];
+                    if (!(spaceUsers && spaceUsers.length > 0)) return [3, 26];
                     owner = spaceUsers[0];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                             material_owner_id: owner.user
                         })];
-                case 24:
-                    _b.sent();
-                    _b.label = 25;
                 case 25:
+                    _b.sent();
+                    _b.label = 26;
+                case 26:
                     console.log("[submitContent] \u6B65\u9AA4\u63D0\u4EA4\uFF0C\u53C2\u6570\u4E3A \u5BA1\u6279\u5355: ".concat(recordId, " \u5F53\u524D\u6B65\u9AA4: ").concat(approvalNew.current_step, " \u5BA1\u6279\u7ED3\u679C\u4E3A: ").concat(currentStepApprovalStatus));
-                    if (!(approvalNew.current_step === consts_1.Step.ai_review && currentStepApprovalStatus === consts_1.ApprovalStatus.approved)) return [3, 35];
+                    if (!(approvalNew.current_step === consts_1.Step.ai_review && currentStepApprovalStatus === consts_1.ApprovalStatus.approved)) return [3, 36];
                     return [4, (0, material_1.getOneDriveMaterials)(ctx, recordId)];
-                case 26:
+                case 27:
                     materials = _b.sent();
-                    if (!(approvalNew.materials_xml_to_word_status != 'completed')) return [3, 29];
+                    if (!(approvalNew.materials_xml_to_word_status != 'completed')) return [3, 30];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalNew._id, {
                             materials_download_from_onedrive_failed_count: 0,
                             materials_download_from_onedrive_status: 'not_started',
@@ -1375,56 +1408,56 @@ var submitContent = function (ctx, recordId, currentStepApprovalStatus, skip) {
                             materials_uploaded_to_onedrive_failed_count: 0,
                             materials_uploaded_to_onedrive_status: 'not_started'
                         })];
-                case 27:
+                case 28:
                     _b.sent();
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-                case 28:
-                    approvalNew = _b.sent();
-                    _b.label = 29;
                 case 29:
-                    if (!(approvalNew.materials_uploaded_to_onedrive_status != 'completed')) return [3, 35];
+                    approvalNew = _b.sent();
+                    _b.label = 30;
+                case 30:
+                    if (!(approvalNew.materials_uploaded_to_onedrive_status != 'completed')) return [3, 36];
                     console.log('materials:', materials.length);
-                    if (!(materials.length === 0)) return [3, 31];
+                    if (!(materials.length === 0)) return [3, 32];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalNew._id, {
                             materials_uploaded_to_onedrive_status: 'no_materials',
                             materials_xml_to_word_status: 'no_materials'
                         })];
-                case 30:
-                    _b.sent();
-                    return [3, 35];
                 case 31:
+                    _b.sent();
+                    return [3, 36];
+                case 32:
                     pendingXmlToWordMaterials = materials.filter(function (material) {
                         return material.xml_converted_word !== true;
                     });
                     console.log('pendingXmlToWordMaterials:', pendingXmlToWordMaterials.length);
-                    if (!(pendingXmlToWordMaterials.length > 0 && approvalNew.materials_xml_to_word_status != 'no_materials')) return [3, 33];
+                    if (!(pendingXmlToWordMaterials.length > 0 && approvalNew.materials_xml_to_word_status != 'no_materials')) return [3, 34];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalNew._id, {
                             materials_xml_to_word_status: 'pending'
                         })];
-                case 32:
+                case 33:
                     _b.sent();
                     return [2];
-                case 33:
+                case 34:
                     pendingUploadMaterials = materials.filter(function (material) {
                         return material.uploaded_to_onedrive !== true;
                     });
                     console.log('pendingUploadMaterials:', pendingUploadMaterials.length);
-                    if (!(pendingUploadMaterials.length > 0)) return [3, 35];
+                    if (!(pendingUploadMaterials.length > 0)) return [3, 36];
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalNew._id, {
                             materials_uploaded_to_onedrive_status: 'pending'
                         })];
-                case 34:
+                case 35:
                     _b.sent();
                     return [2];
-                case 35:
+                case 36:
                     console.time('updateUserStepStatus: ' + recordId);
                     return [4, updateUserStepStatus(ctx, approvalNew, { approvalStatus: currentStepApprovalStatus, approveField: '' })];
-                case 36:
+                case 37:
                     _b.sent();
                     console.timeEnd('updateUserStepStatus: ' + recordId);
                     console.time('advanceApproval: ' + recordId);
                     return [4, advanceApproval(ctx, recordId, currentStepApprovalStatus)];
-                case 37:
+                case 38:
                     _b.sent();
                     console.timeEnd('advanceApproval: ' + recordId);
                     return [2];