Co-authored-by: Shelley Chen <[email protected]>

uwblueprint · Nov 22, 2023 · f0b017b · f0b017b
1 parent 125723c
commit f0b017b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 65 deletions.
diff --git a/backend/typescript/graphql/resolvers/taskResolvers.ts b/backend/typescript/graphql/resolvers/taskResolvers.ts
@@ -14,28 +14,28 @@ const taskResolvers = {
       _parent: undefined,
       { id }: { id: string },
     ): Promise<TaskDTO> => {
-      const task = await taskService.getTaskById(id);
+      const task = await taskService.getTaskById(Number(id));
       return task;
     },
     getTasksByCategoryId: async (
       _parent: undefined,
       { id }: { id: string },
-    ): Promise<TaskDTO[]> => {
-      const tasks = await taskService.getTasksByCategoryId(id);
+    ): Promise<Array<TaskDTO>> => {
+      const tasks = await taskService.getTasksByCategoryId(Number(id));
       return tasks;
     },
     getTasksByAssigneeId: async (
       _parent: undefined,
       { id }: { id: string },
     ): Promise<TaskDTO[]> => {
-      const tasks = await taskService.getTasksByAssigneeId(id);
+      const tasks = await taskService.getTasksByAssigneeId(Number(id));
       return tasks;
     },
     getTasksByAssignerId: async (
       _parent: undefined,
       { id }: { id: string },
     ): Promise<TaskDTO[]> => {
-      const tasks = await taskService.getTasksByAssignerId(id);
+      const tasks = await taskService.getTasksByAssignerId(Number(id));
       return tasks;
     },
   },
@@ -52,63 +52,17 @@ const taskResolvers = {
       { id }: { id: string },
       { task }: { task: InputTaskDTO },
     ): Promise<TaskDTO> => {
-      const updatedTask = await taskService.updateTaskById(id, task);
+      const updatedTask = await taskService.updateTaskById(Number(id), task);
       return updatedTask;
     },
     deleteTask: async (
       _parent: undefined,
       { id }: { id: string },
     ): Promise<TaskDTO> => {
-      const deletedTask = await taskService.deleteTaskById(id);
+      const deletedTask = await taskService.deleteTaskById(Number(id));
       return deletedTask;
     },
   },
 };
 
-// import ResidentService from "../../services/implementations/residentService";
-// import type IResidentService from "../../services/interfaces/residentService";
-// import type { ResidentDTO, CreateResidentDTO, UpdateResidentDTO } from "../../services/interfaces/residentService";
-
-// const residentService: IResidentService = new ResidentService();
-// //const authService: IAuthService = new AuthService(userService, emailService);
-
-// const residentResolvers = {
-//   Query: {
-//     residentsById: async (
-//         _parent: undefined,
-//         { id }: { id: string[] },
-//     ): Promise<Array<ResidentDTO>> => {
-//         return residentService.get_residents_by_id(id.map(Number));
-//     },
-//     allResidents: async (): Promise<Array<ResidentDTO>> => {
-//         return residentService.get_all_residents();
-//     }
-//   },
-//   Mutation: {
-//     addResident: async (
-//         _parent: undefined,
-//         { resident }: { resident: CreateResidentDTO },
-//     ): Promise<ResidentDTO> => {
-//         const newResident = await residentService.add_resident(resident);
-//         return newResident;
-//     },
-//     updateResident: async (
-//         _parent: undefined,
-//         { id, resident }: { id: string, resident: UpdateResidentDTO },
-//     ): Promise<ResidentDTO> => {
-//         const newResident = await residentService.update_resident(parseInt(id), resident);
-//         return newResident;
-//     },
-//     deleteResident: async (
-//         _parent: undefined,
-//         { id }: { id: string },
-//     ): Promise<ResidentDTO> => {
-//         const deletedResident = await residentService.delete_resident(parseInt(id));
-//         return deletedResident;
-//     },
-//   },
-// };
-
-// export default residentResolvers;
-
 export default taskResolvers;
diff --git a/backend/typescript/migrations/2022.01.10T17.43.41.create-user-table.ts b/backend/typescript/migrations/2022.01.10T17.43.41.create-user-table.ts
@@ -12,7 +12,7 @@ export const up: Migration = async ({ context: sequelize }) => {
       primaryKey: true,
       autoIncrement: true,
     },
-    first_name: {
+    firstName: {
       type: DataType.STRING,
       allowNull: false,
     },

diff --git a/backend/typescript/services/implementations/taskService.ts b/backend/typescript/services/implementations/taskService.ts
@@ -153,11 +153,11 @@ class TaskService implements ITaskService {
           title: task.title,
           status: task.status,
           description: task.description,
-          credit_value: task.creditValue,
-          start_date: task.startDate,
-          end_date: task.endDate,
+          creditValue: task.creditValue,
+          startDate: task.startDate,
+          endDate: task.endDate,
           comments: task.comments,
-          recurrence_frequency: task.recurrenceFrequency,
+          recurrenceFrequency: task.recurrenceFrequency,
           category: {
             connect: {
               id: task.categoryId,
@@ -200,11 +200,11 @@ class TaskService implements ITaskService {
           title: task.title,
           status: task.status,
           description: task.description,
-          credit_value: task.creditValue,
-          start_date: task.startDate,
-          end_date: task.endDate,
+          creditValue: task.creditValue,
+          startDate: task.startDate,
+          endDate: task.endDate,
           comments: task.comments,
-          recurrence_frequency: task.recurrenceFrequency,
+          recurrenceFrequency: task.recurrenceFrequency,
           category: {
             connect: {
               id: task.categoryId,

diff --git a/backend/typescript/services/interfaces/taskService.ts b/backend/typescript/services/interfaces/taskService.ts
@@ -18,12 +18,12 @@ export interface InputTaskDTO {
 
 export interface TaskDTO {
   id: number;
-  categoryName?: string;
+  category_name?: string;
   title: string;
   status: Status;
   description: string;
-  assigneeName?: string;
-  assignerName?: string;
+  assignee_name?: string;
+  assigner_name?: string;
   creditValue: number;
   startDate: Date;
   endDate?: Date | null;