Tasks Page

.gitignore

@@ -10,4 +10,5 @@
 **/*.cache
 **/*.egg-info
 **/prisma/migrations
-**/.eslintcache
+**/.eslintcache
+.idea

backend/graphql/index.ts

@@ -14,14 +14,16 @@
 import participantResolvers from "./resolvers/participantResolver";
 import noteResolvers from "./resolvers/noteResolver";
 import authResolver from "./resolvers/auth";
+import taskResolvers from "./resolvers/taskResolver";
 
 const schema = makeExecutableSchema({
   typeDefs: [...scalarTypeDefs, dataModels, customTypes, resolverTypes],
   resolvers: merge(
       scalarResolvers,
       participantResolvers,
       noteResolvers,
-      authResolver
+      authResolver,
+      taskResolvers
   ),
 });
 

backend/graphql/resolvers/taskResolver.ts

@@ -1,106 +1,132 @@
-// import { Status, TaskType } from "../../prisma";
-// import TaskService from "../../services/implementations/taskService";
-// import ITaskService, {
-//   TaskDTO,
-//   InputTaskDTO,
-//   InputTaskAssignedDTO,
-//   TaskAssignedDTO,
-// } from "../../services/interfaces/taskService";
+import {
+  DaysOfWeek,
+  RecurrenceFrequency,
+  Task,
+  TaskType,
+  TimeOption,
+} from "@prisma/client";
+import TaskService from "../../services/implementation/taskImplementation";
+import ITaskService from "../../services/interface/taskInterface";
 
-// const taskService: ITaskService = new TaskService();
+const taskService: ITaskService = new TaskService();
 
-// const taskResolvers = {
-//   Query: {
-//     getTaskById: async (
-//       _parent: undefined,
-//       { taskId }: { taskId: number },
-//     ): Promise<TaskDTO> => {
-//       const task = await taskService.getTaskById(taskId);
-//       return task;
-//     },
-//     getTasksByType: async (
-//       _parent: undefined,
-//       { type }: { type: TaskType },
-//     ): Promise<Array<TaskDTO>> => {
-//       const tasks = await taskService.getTasksByType(type);
-//       return tasks;
-//     },
-//     getTasksByAssigneeId: async (
-//       _parent: undefined,
-//       { assigneeId }: { assigneeId: number },
-//     ): Promise<TaskAssignedDTO[]> => {
-//       const tasks = await taskService.getTasksByAssigneeId(assigneeId);
-//       return tasks;
-//     },
-//     getTasksByAssignerId: async (
-//       _parent: undefined,
-//       { assignerId }: { assignerId: number },
-//     ): Promise<TaskAssignedDTO[]> => {
-//       const tasks = await taskService.getTasksByAssignerId(assignerId);
-//       return tasks;
-//     },
-//     getTasksByStartDate: async (
-//       _parent: undefined,
-//       { startDate }: { startDate: Date },
-//     ): Promise<TaskAssignedDTO[]> => {
-//       const tasks = await taskService.getTasksByStartDate(startDate);
-//       return tasks;
-//     },
-//     // getTasksByEndDate: async (
-//     //   _parent: undefined,
-//     //   { endDate }: { endDate: Date },
-//     // ): Promise<TaskAssignedDTO[]> => {
-//     //   const tasks = await taskService.getTasksByEndDate(endDate);
-//     //   return tasks;
-//     // },
-//     getTasksByStatus: async (
-//       _parent: undefined,
-//       { status }: { status: Status },
-//     ): Promise<TaskAssignedDTO[]> => {
-//       const tasks = await taskService.getTasksByStatus(status);
-//       return tasks;
-//     },
-//   },
-//   Mutation: {
-//     createTask: async (
-//       _parent: undefined,
-//       { task }: { task: InputTaskDTO },
-//     ): Promise<TaskDTO> => {
-//       const newTask = await taskService.createTask(task);
-//       return newTask;
-//     },
-//     updateTask: async (
-//       _parent: undefined,
-//       { taskId, task }: { taskId: number; task: InputTaskDTO },
-//     ): Promise<TaskDTO> => {
-//       const updatedTask = await taskService.updateTaskById(taskId, task);
-//       return updatedTask;
-//     },
-//     deleteTask: async (
-//       _parent: undefined,
-//       { taskId }: { taskId: number },
-//     ): Promise<TaskDTO> => {
-//       const deletedTask = await taskService.deleteTaskById(taskId);
-//       return deletedTask;
-//     },
-//     assignTask: async (
-//       _parent: undefined,
-//       { taskAssigned }: { taskAssigned: InputTaskAssignedDTO },
-//     ): Promise<TaskAssignedDTO> => {
-//       const newTask = await taskService.assignTask(taskAssigned);
-//       return newTask;
-//     },
-//     changeTaskStatus: async (
-//       _parent: undefined,
-//       { taskAssignedId, status }: { taskAssignedId: number; status: Status },
-//     ): Promise<TaskAssignedDTO> => {
-//       const updatedTask = await taskService.changeTaskStatus(
-//         taskAssignedId,
-//         status,
-//       );
-//       return updatedTask;
-//     },
-//   },
-// };
+const taskResolvers = {
+  Query: {
+    getTaskById: async (
+      _parent: undefined,
+      { taskId }: { taskId: number },
+    ): Promise<Task> => {
+      const task = await taskService.getTaskById(taskId);
+      return task;
+    },
+    getTasksByType: async (
+      _parent: undefined,
+      { type }: { type: TaskType },
+    ): Promise<Array<Task>> => {
+      const tasks = await taskService.getTasksByType(type);
+      return tasks;
+    },
+    getTasksByRecurrenceFrequency: async (
+      _parent: undefined,
+      { recurrencePreference }: { recurrencePreference: RecurrenceFrequency },
+    ): Promise<Task[]> => {
+      const tasks =
+        await taskService.getTasksByRecurrenceFrequency(recurrencePreference);
+      return tasks;
+    },
+  },
+  Mutation: {
+    createTask: async (
+      _parent: undefined,
+      {
+        type,
+        name,
+        recurrencePreference,
+        repeatDays,
+        timePreference,
+        credit,
+        deduction,
+        start,
+        end,
+        comment,
+      }: {
+        type: TaskType;
+        name: string;
+        recurrencePreference: RecurrenceFrequency;
+        repeatDays: DaysOfWeek[];
+        timePreference: TimeOption;
+        credit: number;
+        deduction: number;
+        start: string;
+        end: string;
+        comment: string;
+      },
+    ): Promise<Task> => {
+      const newTask = await taskService.createTask(
+        type,
+        name,
+        recurrencePreference,
+        repeatDays,
+        timePreference,
+        credit,
+        deduction,
+        start,
+        end,
+        comment,
+      );
+      return newTask;
+    },
+    updateTask: async (
+      _parent: undefined,
+      {
+        taskId,
+        type,
+        name,
+        recurrencePreference,
+        repeatDays,
+        timePreference,
+        credit,
+        deduction,
+        start,
+        end,
+        comment,
+      }: {
+        taskId: number;
+        type: TaskType;
+        name: string;
+        recurrencePreference: RecurrenceFrequency;
+        repeatDays: DaysOfWeek[];
+        timePreference: TimeOption;
+        credit: number;
+        deduction: number;
+        start: string;
+        end: string;
+        comment: string;
+      },
+    ): Promise<Task> => {
+      const updatedTask = await taskService.updateTaskById(
+        taskId,
+        type,
+        name,
+        recurrencePreference,
+        repeatDays,
+        timePreference,
+        credit,
+        deduction,
+        start,
+        end,
+        comment,
+      );
+      return updatedTask;
+    },
+    deleteTask: async (
+      _parent: undefined,
+      { taskId }: { taskId: number },
+    ): Promise<Task> => {
+      const deletedTask = await taskService.deleteTaskById(taskId);
+      return deletedTask;
+    },
+  },
+};
 
-// export default taskResolvers;
+export default taskResolvers;

backend/graphql/types/enums.ts

@@ -9,6 +9,7 @@
   enum TaskType {
     REQUIRED
     OPTIONAL
+    CUSTOM
   }
 
   enum TaskStatus {
@@ -19,6 +20,28 @@
     COMPLETE
     EXCUSED
   }
+
+  enum DaysOfWeek {
+    MONDAY
+    TUESDAY
+    WEDNESDAY
+    THURSDAY
+    FRIDAY
+    SATURDAY
+    SUNDAY
+  }
+
+  enum RecurrenceFrequency {
+    DAILY
+    EVERY_SELECTED_DAYS
+    ANY_SELECTED_DAYS
+  }
+
+  enum TimeOption {
+    ANYTIME
+    SPECIFIC
+  }
+
 `;
 
 export default customTypes;

backend/graphql/types/models.ts

@@ -19,16 +19,17 @@
   }
 
   type Task {
-    taskId: Int!
-    roomNumber: Int
-    type: TaskType!
-    status: TaskStatus!
-    name: String!
-    isRecurring: Boolean!
-    start: String!
-    end: String!
-    credit: Int!
-    comment: String
+      taskId: Int!
+      type: TaskType!
+      name: String!
+      recurrencePreference: RecurrenceFrequency!
+      repeatDays: [DaysOfWeek!]!
+      timePreference: TimeOption!
+      credit: Int!
+      deduction: Int!
+      start: String
+      end: String
+      comment: String
   }
 
   type Note {