Merge branch 'main' into lakshya/F24/forgot-password-flow

backend/typescript/middlewares/validators/activityValidators.ts → backend/typescript/middlewares/validators/activityTypeValidators.ts

@@ -3,7 +3,7 @@ import { getApiValidationError, validatePrimitive } from "./util";
 
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable-next-line import/prefer-default-export */
-export const activityRequestDtoValidator = async (
+export const activityTypeRequestDtoValidator = async (
   req: Request,
   res: Response,
   next: NextFunction,

backend/typescript/middlewares/validators/userValidators.ts

@@ -63,16 +63,32 @@ export const updateUserDtoValidator = async (
   res: Response,
   next: NextFunction,
 ) => {
-  if (!validatePrimitive(req.body.firstName, "string")) {
+  if (
+    req.body.firstName !== undefined &&
+    req.body.firstName !== null &&
+    !validatePrimitive(req.body.firstName, "string")
+  ) {
     return res.status(400).send(getApiValidationError("firstName", "string"));
   }
-  if (!validatePrimitive(req.body.lastName, "string")) {
+  if (
+    req.body.lastName !== undefined &&
+    req.body.lastName !== null &&
+    !validatePrimitive(req.body.lastName, "string")
+  ) {
     return res.status(400).send(getApiValidationError("lastName", "string"));
   }
-  if (!validatePrimitive(req.body.email, "string")) {
+  if (
+    req.body.email !== undefined &&
+    req.body.email !== null &&
+    !validatePrimitive(req.body.email, "string")
+  ) {
     return res.status(400).send(getApiValidationError("email", "string"));
   }
-  if (!validatePrimitive(req.body.role, "string")) {
+  if (
+    req.body.role !== undefined &&
+    req.body.role !== null &&
+    !validatePrimitive(req.body.role, "string")
+  ) {
     return res.status(400).send(getApiValidationError("role", "string"));
   }
   if (

backend/typescript/migrations/2024.10.09T02.40.17.rename-activity-table-to-activity-type.ts

@@ -0,0 +1,65 @@
+import { DataType } from "sequelize-typescript";
+import { Migration } from "../umzug";
+
+const OLD_TABLE_NAME = "activities";
+const NEW_TABLE_NAME = "activity_types";
+const USER_PET_ACTIVITIES_TABLE = "user_pet_activities";
+const ACTIVITIES_TABLE = "activities";
+
+export const up: Migration = async ({ context: sequelize }) => {
+  // Rename the activities table to activity_types
+  await sequelize
+    .getQueryInterface()
+    .renameTable(OLD_TABLE_NAME, NEW_TABLE_NAME);
+
+  // Change the activity_id column in user_pet_activities to activity_type_id
+  await sequelize
+    .getQueryInterface()
+    .renameColumn(USER_PET_ACTIVITIES_TABLE, "activity_id", "activity_type_id");
+
+  // Update the references for activity_type_id to point to the new activity_types table
+  await sequelize
+    .getQueryInterface()
+    .changeColumn(USER_PET_ACTIVITIES_TABLE, "activity_type_id", {
+      type: DataType.INTEGER,
+      allowNull: false,
+      references: {
+        model: NEW_TABLE_NAME, // Reference the new table name
+        key: "id",
+      },
+    });
+
+  // Change the name of user_pet_activities to activities
+  await sequelize
+    .getQueryInterface()
+    .renameTable(USER_PET_ACTIVITIES_TABLE, ACTIVITIES_TABLE);
+};
+
+export const down: Migration = async ({ context: sequelize }) => {
+  // Rename the activities table back to user_pet_activities
+  await sequelize
+    .getQueryInterface()
+    .renameTable(ACTIVITIES_TABLE, USER_PET_ACTIVITIES_TABLE);
+
+  // Rename the activity_types table back to activities
+  await sequelize
+    .getQueryInterface()
+    .renameTable(NEW_TABLE_NAME, OLD_TABLE_NAME);
+
+  // Revert the activity_type_id column back to activity_id
+  await sequelize
+    .getQueryInterface()
+    .renameColumn(USER_PET_ACTIVITIES_TABLE, "activity_type_id", "activity_id");
+
+  // Revert the activity_id column to reference the old activities table
+  await sequelize
+    .getQueryInterface()
+    .changeColumn(USER_PET_ACTIVITIES_TABLE, "activity_id", {
+      type: DataType.INTEGER,
+      allowNull: false,
+      references: {
+        model: OLD_TABLE_NAME, // Revert back to the old table name
+        key: "id",
+      },
+    });
+};

backend/typescript/models/activity.model.ts

@@ -1,7 +1,56 @@
-import { Column, Model, Table } from "sequelize-typescript";
+import {
+  Column,
+  Model,
+  Table,
+  DataType,
+  ForeignKey,
+  BelongsTo,
+} from "sequelize-typescript";
+import User from "./user.model";
+import Pet from "./pet.model";
+import ActivityType from "./activityType.model";
 
 @Table({ timestamps: false, tableName: "activities" })
 export default class Activity extends Model {
-  @Column
-  activity_name!: string;
+  @Column({})
+  activity_id!: number;
+
+  @ForeignKey(() => User) // in case of null, task has not been assigned
+  @Column({})
+  user_id?: number;
+
+  @BelongsTo(() => User)
+  user?: User;
+
+  @ForeignKey(() => Pet)
+  @Column({})
+  pet_id!: number;
+
+  @BelongsTo(() => Pet)
+  pet!: Pet;
+
+  @ForeignKey(() => ActivityType)
+  @Column({})
+  activity_type_id!: number;
+
+  @BelongsTo(() => ActivityType)
+  activity_type!: ActivityType;
+
+  @Column({})
+  scheduled_start_time?: Date;
+
+  @Column({})
+  start_time?: Date;
+
+  @Column({})
+  end_time?: Date;
+
+  @Column({ type: DataType.TEXT })
+  notes?: string;
+
+  @Column({})
+  created_at!: Date;
+
+  @Column({})
+  updated_at?: Date;
 }

backend/typescript/models/activityType.model.ts

@@ -0,0 +1,7 @@
+import { Column, Model, Table } from "sequelize-typescript";
+
+@Table({ timestamps: false, tableName: "activity_types" })
+export default class ActivityType extends Model {
+  @Column
+  activity_name!: string;
+}