Merge pull request #353 from uwblueprint/annie/schema_refactor

Annie/schema refactor

Author: applepie7864

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,3 +19,4 @@
 - [ ] All of my containers are healthy and not producing any error messages
 - [ ] The frontend and backend ports are set to 3000 & 5000, respectively
 - [ ] If new packages were installed, I ran yarn install, and there is no package-lock.json file present in the codebase
+- [ ] I took note of any changes made outside of my ticket (e.g. refactored common ui component, updated an endpoint, changed the schema, etc.)

RAILWAY_DEPLOYMENT.md

@@ -150,3 +150,5 @@ Railway respects the ENTRYPOINT, so both environments run `prismaInitAndRun` on
    ```
 4. **Monitor Railway logs** on deployment to verify seeding behavior
 5. **Keep system badges in sync** between `prodData.ts` and production database
+
+TODO: Review & update doc

README.md

@@ -39,9 +39,10 @@ Backend: http://localhost:5000/graphql
 
 ## Database Interactions
 Apply / migrate changes in prisma.schema to the database:
-1. Change the DATABASE_URL in the backend .env file to: postgresql://postgres:postgres@**localhost**:5432/mp
-2. In your terminal, run `npx prisma migrate dev` in the backend folder and follow the prompts
-3. Don’t forget to reset DATABASE_URL back to postgresql://postgres:postgres@**mp_db**:5432/mp
+1. First ensure your `mp_db` container is running 
+2. Change the DATABASE_URL in the backend .env file to: postgresql://postgres:postgres@**localhost**:5432/mp
+3. In your terminal, run `npx prisma migrate dev` in the backend folder and follow the prompts
+4. Don’t forget to reset DATABASE_URL back to postgresql://postgres:postgres@**mp_db**:5432/mp
 
 Common database commands:
 ```bash

backend/.eslintrc.js

@@ -20,6 +20,8 @@ module.exports = {
     "class-methods-use-this": 0,
     "import/prefer-default-export": "off",
     "no-console": "off",
+    "import/no-cycle": "off",
+    "@typescript-eslint/no-explicit-any": "off",
   },
   ignorePatterns: ["build/*"],
 };

backend/Dockerfile

@@ -3,7 +3,5 @@ WORKDIR /app
 COPY . ./
 RUN apt-get update -y && apt-get install -y openssl
 RUN yarn install
-ARG NODE_ENV
-ENV NODE_ENV=$NODE_ENV
 EXPOSE 5000
-ENTRYPOINT ["yarn", "prismaInitAndRun"]
+ENTRYPOINT ["yarn", "start"]

backend/constants/days.ts

@@ -0,0 +1,11 @@
+import { DayOfWeek } from "@prisma/client";
+
+export const orderedDays = [
+  DayOfWeek.SUNDAY,
+  DayOfWeek.MONDAY,
+  DayOfWeek.TUESDAY,
+  DayOfWeek.WEDNESDAY,
+  DayOfWeek.THURSDAY,
+  DayOfWeek.FRIDAY,
+  DayOfWeek.SATURDAY,
+];

backend/constants/roles.ts

@@ -0,0 +1,3 @@
+export const ADMIN = "admin";
+export const RELIEF = "relief";
+export const PARTICIPANT = "participant";

backend/constants/systemBadges.ts

@@ -0,0 +1,19 @@
+export const LOGIN = "Log In";
+export const PERFECT_SCORE_REQUIRED = "Perfect Score (Required Tasks)";
+export const PERFECT_SCORE_OPTIONAL = "Perfect Score (Optional Tasks)";
+export const MONEY_EARNED = "Money Earned Milestone";
+export const PR_LEADER = "PR Leader";
+export const INDIVIDUAL_GOAL = "Individual Goals Complete";
+export const FIRST_GOAL = "First Goal Set";
+export const JACK_OF_ALL_TRADES = "Jack of All Trades";
+
+export const SYSTEM_BADGES = [
+  LOGIN,
+  PERFECT_SCORE_REQUIRED,
+  PERFECT_SCORE_OPTIONAL,
+  MONEY_EARNED,
+  PR_LEADER,
+  INDIVIDUAL_GOAL,
+  FIRST_GOAL,
+  JACK_OF_ALL_TRADES,
+];

backend/crons/index.ts

@@ -1,75 +1,34 @@
 import cron from "node-cron";
-import expireAdminNotes from "./scripts/expireAdminNotes";
-import expireAdminAnnouncements from "./scripts/expireAdminAnnouncements";
-import expireLoginStreak from "./scripts/expireLoginStreak";
-import createAssignedTasks from "./scripts/createAssignedTask";
-import {
-  sendWeeklyReports,
-  sendMonthlyReports,
-} from "./scripts/sendReportEmails";
+import { isLastDayOfMonth } from "date-fns";
+import expireNotes from "./scripts/expireNotes";
+import expireAnnouncements from "./scripts/expireAnnouncements";
+import resetLoginStreak from "./scripts/resetLoginStreak";
+import assignRequiredTasks from "./scripts/assignRequiredTasks";
+import sendMonthlyReport from "./scripts/sendMonthlyReport";
+import sendWeeklyReport from "./scripts/sendWeeklyReport";
 
 cron.schedule("0 0 * * * *", async () => {
-  const res = await expireAdminNotes();
-  if (res) {
-    console.log("Deleted expired notes");
-  } else {
-    console.log("Could not expire admin notes");
-  }
+  await expireNotes();
 });
 
 cron.schedule("0 0 0 * * *", async () => {
-  const res = await expireAdminAnnouncements();
-  if (res) {
-    console.log("Expired admin announcements");
-  } else {
-    console.log("Could not expire admin announcements");
-  }
+  await expireAnnouncements();
 });
 
-cron.schedule("0 0 0 * * *", async () => {
-  const res = await expireLoginStreak();
-  if (res) {
-    console.log("Expired login streaks");
-  } else {
-    console.log("Could not expire login streaks");
-  }
+cron.schedule("0 59 23 * * *", async () => {
+  await resetLoginStreak();
 });
 
-cron.schedule("0 0 * * 1", async () => {
-  const res = await createAssignedTasks();
-  if (res) {
-    console.log("Created assigned tasks");
-  } else {
-    console.log("Could not create assigned tasks");
-  }
+cron.schedule("0 0 0 * * 0", async () => {
+  await assignRequiredTasks();
 });
 
-// Weekly reports - every Monday at 9 AM
-cron.schedule("0 9 * * 1", async () => {
-  const timestamp = new Date().toISOString();
-  console.log(
-    `[${timestamp}] Starting weekly report generation and emailing...`
-  );
-
-  const res = await sendWeeklyReports();
-  if (res) {
-    console.log(`[${timestamp}] Weekly reports sent successfully`);
-  } else {
-    console.log(`[${timestamp}] Could not send weekly reports`);
-  }
+cron.schedule("0 0 23 * * 6", async () => {
+  await sendWeeklyReport();
 });
 
-// Monthly reports - first day of month at 9 AM
-cron.schedule("0 9 1 * *", async () => {
-  const timestamp = new Date().toISOString();
-  console.log(
-    `[${timestamp}] Starting monthly report generation and emailing...`
-  );
-
-  const res = await sendMonthlyReports();
-  if (res) {
-    console.log(`[${timestamp}] Monthly reports sent successfully`);
-  } else {
-    console.log(`[${timestamp}] Could not send monthly reports`);
+cron.schedule("0 0 23 * * *", async () => {
+  if (isLastDayOfMonth(new Date())) {
+    await sendMonthlyReport();
   }
 });

backend/crons/scripts/assignRequiredTasks.ts

@@ -0,0 +1,18 @@
+import { Task, TaskType } from "@prisma/client";
+import db from "../../prisma";
+import { assignTasksToAllParticipants } from "../../utils/taskUtils";
+
+// assigns all required tasks to each participant for the current week
+async function assignRequiredTasks() {
+  try {
+    const requiredTasks: Task[] = await db.task.findMany({
+      where: { type: TaskType.REQUIRED },
+    });
+    assignTasksToAllParticipants(requiredTasks);
+    console.log("successfully assigned required tasks to participants");
+  } catch (err) {
+    console.error(err);
+  }
+}
+
+export default assignRequiredTasks;