Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Auto Approve for Back-End Pemula Google Cloud #14

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/service/report-generator/report-generator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ReviewResult, {ReviewResultStatus} from "../../entities/review-result/course-submission-review/review-result";
import * as fs from "fs";

function itShouldMeetAGRSReportSpec(report: any): void {

Check warning on line 6 in src/service/report-generator/report-generator.test.ts

View workflow job for this annotation

GitHub Actions / lint (14.x)

Unexpected any. Specify a different type
expect(report.submission_id).toBeDefined()
expect(typeof report.submission_id).toEqual('number')
expect(report.message).toBeDefined()
Expand Down Expand Up @@ -36,7 +36,8 @@
rating: 5,
status: ReviewResultStatus.Approve,
checklist: submissionRequirement,
message: 'Selamat'
message: 'Selamat',
draft: false,
}

const studentProjectPath = './test/student-project/project-with-correct-autoreview-config'
Expand Down
17 changes: 15 additions & 2 deletions src/service/report-generator/report-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
checklist: reviewResult.checklist,
checklist_keys: this.getCompletedChecklist(reviewResult),
is_passed: isApproved,
is_draft: true,
is_draft: this.getDraftDecision(isApproved, autoReviewConfig),
};

this.result.push(summary);
Expand All @@ -41,13 +41,26 @@
raiseDomainEvent('report generated')
}

private getDraftDecision(isApproved: boolean, autoReviewConfig: any): boolean {

Check warning on line 44 in src/service/report-generator/report-generator.ts

View workflow job for this annotation

GitHub Actions / lint (14.x)

Unexpected any. Specify a different type
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) {

Check warning on line 63 in src/service/report-generator/report-generator.ts

View workflow job for this annotation

GitHub Actions / lint (14.x)

Unexpected any. Specify a different type
const mainTemplate = templates.find(template => template.courseId === autoReviewConfig?.course_id)

if (!mainTemplate) {
Expand All @@ -67,7 +80,7 @@
}


private getAutoReviewConfig(projectPath: string): any | null {

Check warning on line 83 in src/service/report-generator/report-generator.ts

View workflow job for this annotation

GitHub Actions / lint (14.x)

Unexpected any. Specify a different type

const configFilePath = `${projectPath}/auto-review-config.json`
if (!existsSync(configFilePath)) {
Expand Down
Loading
Loading