Merge pull request #14 from dicoding-dev/feature/enable-fully-auto-gr…

…ade-for-approval-scenario Enable Auto Approve for Back-End Pemula Google Cloud
dicoding-dev · Nov 3, 2023 · 3cd40d3 · 3cd40d3
2 parents 01c1b6d + 9c7e7d4
commit 3cd40d3
Show file tree

Hide file tree

Showing 6 changed files with 530 additions and 512 deletions.
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.1.2",
+    "@types/minimist": "^1.2.4",
     "@types/newman": "^5.3.1",
     "@typescript-eslint/eslint-plugin": "^5.40.0",
     "@typescript-eslint/parser": "^5.40.0",

diff --git a/src/entities/review-result/course-submission-review/course-submission-review.ts b/src/entities/review-result/course-submission-review/course-submission-review.ts
@@ -39,7 +39,8 @@ class CourseSubmissionReview {
             rating: courseSubmissionAcception.rating,
             message: courseSubmissionAcception.messages,
             status: ReviewResultStatus.Approve,
-            checklist: this.submissionCriteriaCheck.reviewChecklistResult
+            checklist: this.submissionCriteriaCheck.reviewChecklistResult,
+            draft: false,
         }
     }
 
@@ -52,9 +53,10 @@ class CourseSubmissionReview {
             rating: 0,
             message: courseSubmissionRejection.messages,
             status: ReviewResultStatus.Reject,
-            checklist: this.submissionCriteriaCheck.reviewChecklistResult
+            checklist: this.submissionCriteriaCheck.reviewChecklistResult,
+            draft: true,
         }
     }
 }
 
-export default CourseSubmissionReview
+export default CourseSubmissionReview
diff --git a/src/entities/review-result/course-submission-review/review-result.ts b/src/entities/review-result/course-submission-review/review-result.ts
@@ -4,12 +4,13 @@ interface ReviewResult {
     rating: number,
     message: string,
     status: ReviewResultStatus,
-    checklist: SubmissionRequirement
+    checklist: SubmissionRequirement,
+    draft: boolean,
 }
 
 export enum ReviewResultStatus {
     Approve = "Approve",
     Reject = "Reject",
 }
 
-export default ReviewResult
+export default ReviewResult
diff --git a/src/service/report-generator/report-generator.test.ts b/src/service/report-generator/report-generator.test.ts
@@ -36,7 +36,8 @@ describe('checklist id resolver test', () => {
             rating: 5,
             status: ReviewResultStatus.Approve,
             checklist: submissionRequirement,
-            message: 'Selamat'
+            message: 'Selamat',
+            draft: false,
         }
 
         const studentProjectPath = './test/student-project/project-with-correct-autoreview-config'

diff --git a/src/service/report-generator/report-generator.ts b/src/service/report-generator/report-generator.ts
@@ -28,7 +28,7 @@ class ReportGenerator {
             checklist: reviewResult.checklist,
             checklist_keys: this.getCompletedChecklist(reviewResult),
             is_passed: isApproved,
-            is_draft: true,
+            is_draft: this.getDraftDecision(isApproved, autoReviewConfig),
         };
 
         this.result.push(summary);
@@ -41,13 +41,26 @@ class ReportGenerator {
         raiseDomainEvent('report generated')
     }
 
+    private getDraftDecision(isApproved: boolean, autoReviewConfig: any): boolean {
+        const allowedCoursesThatFullyGrading = [
+          342, // Back-End Pemula with Google Cloud
+        ]
+
+        if (allowedCoursesThatFullyGrading.includes(autoReviewConfig.course_id)) {
+            // set `draft` to false, if approved is true
+            return !isApproved
+        }
+
+        return true
+    }
+
     private getCompletedChecklist(reviewResult: ReviewResult) {
         return Object.keys(reviewResult.checklist)
             .filter(requirementName => reviewResult.checklist[requirementName].status)
 
     }
 
-    getReviewMessageWithTemplate(reviewResult: ReviewResult, autoReviewConfig) {
+    getReviewMessageWithTemplate(reviewResult: ReviewResult, autoReviewConfig: any) {
         const mainTemplate = templates.find(template => template.courseId === autoReviewConfig?.course_id)
 
         if (!mainTemplate) {