Merge pull request #127 from uwblueprint/annie/code-cleanup-and-organization

Annie/code cleanup and organization

Author: applepie7864

.github/workflows/firebase-hosting-merge.yml

@@ -18,6 +18,7 @@ module.exports = {
   rules: {
     "prettier/prettier": ["error", { endOfLine: "auto" }],
     "class-methods-use-this": 0,
+    "import/prefer-default-export": "off",
   },
   ignorePatterns: ["build/*"],
 };

.github/workflows/firebase-hosting-pull-request.yml

@@ -1,111 +1,66 @@
-import { makeExecutableSchema, gql } from "apollo-server-express";
-import { applyMiddleware } from "graphql-middleware";
+import { makeExecutableSchema } from "apollo-server-express";
 import { merge } from "lodash";
+// import { applyMiddleware } from "graphql-middleware";
+
 import {
   typeDefs as scalarTypeDefs,
   resolvers as scalarResolvers,
 } from "graphql-scalars";
 
-// import { UserType } from "../prisma";
-// import {
-//   isAuthorizedByEmail,
-//   isAuthorizedByUserType,
-//   isAuthorizedByUserId,
-// } from "../middlewares/auth";
-import authResolvers from "./resolvers/authResolvers";
-import authType from "./types/authType";
-import notificationResolvers from "./resolvers/notificationResolvers";
-import notificationType from "./types/notificationType";
-import staffResolvers from "./resolvers/staffResolver";
-import staffType from "./types/staffType";
-import residentResolvers from "./resolvers/residentResolvers";
-import residentType from "./types/residentType";
-import taskResolvers from "./resolvers/taskResolvers";
-import taskType from "./types/taskType";
-import warningResolvers from "./resolvers/warningResolvers";
-import warningType from "./types/warningType";
-
-const query = gql`
-  type Query {
-    _empty: String
-  }
-`;
+import dataModels from "./types/models";
+import customTypes from "./types/enums";
+import resolverTypes from "./types/resolvers";
 
-const mutation = gql`
-  type Mutation {
-    _empty: String
-  }
-`;
+import participantResolvers from "./resolvers/participantResolver";
+import miscResolvers from "./resolvers/miscResolver";
 
-const executableSchema = makeExecutableSchema({
-  typeDefs: [
-    ...scalarTypeDefs,
-    query,
-    mutation,
-    authType,
-    notificationType,
-    staffType,
-    residentType,
-    taskType,
-    warningType,
-  ],
-  resolvers: merge(
-    scalarResolvers,
-    authResolvers,
-    notificationResolvers,
-    staffResolvers,
-    residentResolvers,
-    taskResolvers,
-    warningResolvers,
-  ),
+const schema = makeExecutableSchema({
+  typeDefs: [...scalarTypeDefs, dataModels, customTypes, resolverTypes],
+  resolvers: merge(scalarResolvers, participantResolvers, miscResolvers),
 });
 
+export default schema;
+
 // const authorizedByAllUserTypes = () =>
 //   isAuthorizedByUserType(new Set([UserType.STAFF, UserType.RESIDENT]));
 // const authorizedByStaff = () =>
 //   isAuthorizedByUserType(new Set([UserType.STAFF]));
 
-const graphQLMiddlewares = {
-  Query: {
-    // getNotificationsByUserId: authorizedByAllUserTypes(),
-    // getNotificationById: authorizedByAllUserTypes(),
-    // getStaffByIds: authorizedByStaff(),
-    // getAllStaff: authorizedByStaff(),
-    // getResidentsByIds: authorizedByStaff(),
-    // getAllResidents: authorizedByStaff(),
-    // getActiveResidents: authorizedByStaff(),
-    // getTaskById: authorizedByAllUserTypes(),
-    // getTasksByType: authorizedByAllUserTypes(),
-    // getTasksByAssigneeId: authorizedByAllUserTypes(),
-    // getTasksByAssignerId: authorizedByStaff(),
-    // getTasksByStartDate: authorizedByAllUserTypes(),
-    // getTasksByEndDate: authorizedByAllUserTypes(),
-    // getTasksByStatus: authorizedByAllUserTypes(),
-  },
-  Mutation: {
-    // login: isAuthorizedByEmail("email"),
-    // refresh: isAuthorizedByEmail("email"),
-    // logout: isAuthorizedByUserId("userId"),
-    // resetPassword: isAuthorizedByEmail("email"),
-    // sendNotification: authorizedByAllUserTypes(),
-    // deleteUserNotification: authorizedByStaff(),
-    // updateSeenNotification: authorizedByAllUserTypes(),
-    // sendAnnouncement: authorizedByStaff(),
-    // addStaff: authorizedByStaff(),
-    // updateStaff: authorizedByStaff(),
-    // deleteStaff: authorizedByStaff(),
-    // addResident: authorizedByStaff(),
-    // updateResident: authorizedByStaff(),
-    // deleteResident: authorizedByStaff(),
-    // redeemCredits: authorizedByStaff(),
-    // createTask: authorizedByAllUserTypes(),
-    // updateTask: authorizedByAllUserTypes(),
-    // deleteTask: authorizedByAllUserTypes(),
-    // assignTask: authorizedByStaff(),
-    // changeTaskStatus: authorizedByStaff(),
-    // addWarning: authorizedByStaff(),
-    // deleteWarning: authorizedByStaff(),
-  },
-};
+// const graphQLMiddlewares = {
+//   Query: {
+//     // getNotificationsByUserId: authorizedByAllUserTypes(),
+//     // getNotificationById: authorizedByAllUserTypes(),
+//     // getStaffByIds: authorizedByStaff(),
+//     // getAllStaff: authorizedByStaff(),
+//     // getResidentsByIds: authorizedByStaff(),
+//     // getAllResidents: authorizedByStaff(),
+//     // getActiveResidents: authorizedByStaff(),
+//     // getTaskById: authorizedByAllUserTypes(),
+//     // getTasksByType: authorizedByAllUserTypes(),
+//     // getTasksByAssigneeId: authorizedByAllUserTypes(),
+//     // getTasksByAssignerId: authorizedByStaff(),
+//     // getTasksByStartDate: authorizedByAllUserTypes(),
+//     // getTasksByEndDate: authorizedByAllUserTypes(),
+//     // getTasksByStatus: authorizedByAllUserTypes(),
+//   },
+//   Mutation: {
+//     // sendNotification: authorizedByAllUserTypes(),
+//     // deleteUserNotification: authorizedByStaff(),
+//     // updateSeenNotification: authorizedByAllUserTypes(),
+//     // sendAnnouncement: authorizedByStaff(),
+//     // addStaff: authorizedByStaff(),
+//     // updateStaff: authorizedByStaff(),
+//     // deleteStaff: authorizedByStaff(),
+//     // addResident: authorizedByStaff(),
+//     // updateResident: authorizedByStaff(),
+//     // deleteResident: authorizedByStaff(),
+//     // redeemCredits: authorizedByStaff(),
+//     // createTask: authorizedByAllUserTypes(),
+//     // updateTask: authorizedByAllUserTypes(),
+//     // deleteTask: authorizedByAllUserTypes(),
+//     // assignTask: authorizedByStaff(),
+//     // changeTaskStatus: authorizedByStaff(),
+//   },
+// };
 
-export default applyMiddleware(executableSchema, graphQLMiddlewares);
+// export default applyMiddleware(executableSchema, graphQLMiddlewares);