From 843de871ee03036f221695931f3c13e266162b05 Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sat, 4 May 2024 22:36:48 +0530 Subject: [PATCH 1/7] refractored retrospective and review --- prisma/seed/forms/index.ts | 2 +- prisma/seed/meetings.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/prisma/seed/forms/index.ts b/prisma/seed/forms/index.ts index 83b73e89..ff5dc3ca 100644 --- a/prisma/seed/forms/index.ts +++ b/prisma/seed/forms/index.ts @@ -59,7 +59,7 @@ export const populateFormsAndResponses = async () => { name: "meeting", }, }, - title: "Retrospective & Review", + title: FormTitles.sprintRetroAndReview, questions: { create: [ { diff --git a/prisma/seed/meetings.ts b/prisma/seed/meetings.ts index 46cc4ad3..a12f0a88 100644 --- a/prisma/seed/meetings.ts +++ b/prisma/seed/meetings.ts @@ -1,5 +1,6 @@ import { getRandomDateDuringSprint, getSprintId } from "./utils"; import { prisma } from "./prisma-client"; +import { FormTitles } from "src/global/constants/formTitles"; export const populateMeetings = async () => { // connect teamMeetings and form id @@ -97,7 +98,7 @@ export const populateMeetings = async () => { data: { form: { connect: { - title: "Retrospective & Review", + title: FormTitles.sprintRetroAndReview, }, }, meeting: { From 4b448b6b95bbb168deb45b86578d8a049983417c Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sat, 4 May 2024 22:46:14 +0530 Subject: [PATCH 2/7] refractored sprint planning --- prisma/seed/meetings.ts | 4 ++-- test/sprints.e2e-spec.ts | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/prisma/seed/meetings.ts b/prisma/seed/meetings.ts index a12f0a88..054188dc 100644 --- a/prisma/seed/meetings.ts +++ b/prisma/seed/meetings.ts @@ -51,7 +51,7 @@ export const populateMeetings = async () => { //find question Ids from sprint planning form const sprintPlanningForm = await prisma.form.findUnique({ where: { - title: "Sprint Planning", + title: FormTitles.sprintPlanning, }, select: { questions: true, @@ -62,7 +62,7 @@ export const populateMeetings = async () => { data: { form: { connect: { - title: "Sprint Planning", + title: FormTitles.sprintPlanning, }, }, meeting: { diff --git a/test/sprints.e2e-spec.ts b/test/sprints.e2e-spec.ts index eab30b51..8a526cdd 100644 --- a/test/sprints.e2e-spec.ts +++ b/test/sprints.e2e-spec.ts @@ -294,7 +294,7 @@ describe("Sprints Controller (e2e)", () => { ) .set("Cookie", accessToken) .send({ - title: "Sprint Planning", + title: FormTitles.sprintPlanning, description: "This is a meeting description.", dateTime: "2024-03-01T23:11:20.271Z", meetingLink: "samplelink.com/meeting1234", @@ -322,11 +322,11 @@ describe("Sprints Controller (e2e)", () => { it("- verify new sprint meeting found in database", async () => { const meeting = await prisma.teamMeeting.findFirst({ where: { - title: "Sprint Planning", + title: FormTitles.sprintPlanning, notes: "Notes for the meeting", }, }); - return expect(meeting.title).toEqual("Sprint Planning"); + return expect(meeting.title).toEqual(FormTitles.sprintPlanning); }); it("should return 409 if trying to create a meeting that already exists for sprint", async () => { @@ -338,7 +338,7 @@ describe("Sprints Controller (e2e)", () => { ) .set("Cookie", accessToken) .send({ - title: "Sprint Planning", + title: FormTitles.sprintPlanning, description: "This is a meeting description.", dateTime: "2024-03-01T23:11:20.271Z", meetingLink: "samplelink.com/meeting1234", @@ -356,7 +356,7 @@ describe("Sprints Controller (e2e)", () => { ) .set("Cookie", accessToken) .send({ - title: "Sprint Planning", + title: FormTitles.sprintPlanning, description: "This is a meeting description.", dateTime: "2024-03-01T23:11:20.271Z", meetingLink: "samplelink.com/meeting1234", From 4e6686b0dec8fa9df91c1a406c3e7facf793e077 Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sat, 4 May 2024 22:57:10 +0530 Subject: [PATCH 3/7] refractored sprint-check-in --- src/sprints/sprints.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sprints/sprints.service.ts b/src/sprints/sprints.service.ts index b4cf5e15..485efdb6 100644 --- a/src/sprints/sprints.service.ts +++ b/src/sprints/sprints.service.ts @@ -13,6 +13,7 @@ import { FormsService } from "../forms/forms.service"; import { UpdateMeetingFormResponseDto } from "./dto/update-meeting-form-response.dto"; import { CreateCheckinFormDto } from "./dto/create-checkin-form.dto"; import { GlobalService } from "../global/global.service"; +import { FormTitles } from "src/global/constants/formTitles"; @Injectable() export class SprintsService { @@ -554,7 +555,7 @@ export class SprintsService { this.globalServices.responseDtoToArray(createCheckinForm); await this.globalServices.checkQuestionsInFormByTitle( - "Sprint Check-in", + FormTitles.sprintCheckin, responsesArray, ); From 43fb6f0b7884f5d68dd0e89606ec0c709b44de1a Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sat, 4 May 2024 23:04:38 +0530 Subject: [PATCH 4/7] refractored solo project and voyage application form --- prisma/seed/solo-project.ts | 3 ++- prisma/seed/voyage-app.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/prisma/seed/solo-project.ts b/prisma/seed/solo-project.ts index 4aa0f524..fb83dcf0 100644 --- a/prisma/seed/solo-project.ts +++ b/prisma/seed/solo-project.ts @@ -1,3 +1,4 @@ +import { FormTitles } from "src/global/constants/formTitles"; import { passedSampleFeedback } from "./data/text/solo-project-feedback"; import { prisma } from "./prisma-client"; @@ -18,7 +19,7 @@ export const populateSoloProjects = async () => { const soloProjectForm = await prisma.form.findUnique({ where: { - title: "Solo Project Submission Form", + title: FormTitles.soloProjectSubmission, }, select: { id: true, diff --git a/prisma/seed/voyage-app.ts b/prisma/seed/voyage-app.ts index ed12a44b..4c72e14f 100644 --- a/prisma/seed/voyage-app.ts +++ b/prisma/seed/voyage-app.ts @@ -1,3 +1,4 @@ +import { FormTitles } from "src/global/constants/formTitles"; import { prisma } from "./prisma-client"; export const populateVoyageApplications = async () => { @@ -5,7 +6,7 @@ export const populateVoyageApplications = async () => { const voyageApplicationForm = await prisma.form.findUnique({ where: { - title: "Voyage Application Form", + title: FormTitles.voyageApplication, }, select: { id: true, From 15314e96f2a23b359ef30b83ebb628311d887d66 Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sat, 4 May 2024 23:14:44 +0530 Subject: [PATCH 5/7] minor changes --- src/sprints/sprints.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sprints/sprints.service.ts b/src/sprints/sprints.service.ts index 485efdb6..e63daabc 100644 --- a/src/sprints/sprints.service.ts +++ b/src/sprints/sprints.service.ts @@ -13,7 +13,7 @@ import { FormsService } from "../forms/forms.service"; import { UpdateMeetingFormResponseDto } from "./dto/update-meeting-form-response.dto"; import { CreateCheckinFormDto } from "./dto/create-checkin-form.dto"; import { GlobalService } from "../global/global.service"; -import { FormTitles } from "src/global/constants/formTitles"; +import { FormTitles } from "../global/constants/formTitles"; @Injectable() export class SprintsService { From 9fa5972546bee8c7bede65155c174af9ceb658b1 Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Sun, 5 May 2024 16:14:37 +0530 Subject: [PATCH 6/7] updated changelog.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ae8f28b..160ada3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ Another example [here](https://co-pilot.dev/changelog) - Remove teamMeetings from response for getSprintDatesByTeamId [#139](https://github.com/chingu-x/chingu-dashboard-be/pull/139) - Updated response for route GET sprints/meetings/{meetingId} to include updatedAt for agendas [#140](https://github.com/chingu-x/chingu-dashboard-be/pull/140) - Update test github actions workflow with timeout [#143](https://github.com/chingu-x/chingu-dashboard-be/pull/143) +- Refractor of all form title reference to use values from formTitle.ts [#145](https://github.com/chingu-x/chingu-dashboard-be/pull/145) ### Fixed From 0ffaf9d5b0a155e83260157a4b77c42d63dadc7b Mon Sep 17 00:00:00 2001 From: Arman Kumar Jena Date: Mon, 6 May 2024 08:11:50 +0530 Subject: [PATCH 7/7] updated file imports for seed --- prisma/seed/meetings.ts | 2 +- prisma/seed/solo-project.ts | 2 +- prisma/seed/voyage-app.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prisma/seed/meetings.ts b/prisma/seed/meetings.ts index 054188dc..c648225a 100644 --- a/prisma/seed/meetings.ts +++ b/prisma/seed/meetings.ts @@ -1,6 +1,6 @@ import { getRandomDateDuringSprint, getSprintId } from "./utils"; import { prisma } from "./prisma-client"; -import { FormTitles } from "src/global/constants/formTitles"; +import { FormTitles } from "../../src/global/constants/formTitles"; export const populateMeetings = async () => { // connect teamMeetings and form id diff --git a/prisma/seed/solo-project.ts b/prisma/seed/solo-project.ts index fb83dcf0..18401052 100644 --- a/prisma/seed/solo-project.ts +++ b/prisma/seed/solo-project.ts @@ -1,4 +1,4 @@ -import { FormTitles } from "src/global/constants/formTitles"; +import { FormTitles } from "../../src/global/constants/formTitles"; import { passedSampleFeedback } from "./data/text/solo-project-feedback"; import { prisma } from "./prisma-client"; diff --git a/prisma/seed/voyage-app.ts b/prisma/seed/voyage-app.ts index 4c72e14f..c6a1bce7 100644 --- a/prisma/seed/voyage-app.ts +++ b/prisma/seed/voyage-app.ts @@ -1,4 +1,4 @@ -import { FormTitles } from "src/global/constants/formTitles"; +import { FormTitles } from "../../src/global/constants/formTitles"; import { prisma } from "./prisma-client"; export const populateVoyageApplications = async () => {