Merge pull request #32 from Advanced-computer-lab-2024/backend/rashee…

…datia/CategoryCRUD Adjusted Category in Activity from string to CategoryType
Advanced-computer-lab-2024 · Oct 6, 2024 · 0b7a233 · 0b7a233
2 parents 1890430 + 798c639
commit 0b7a233
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/backend/src/database/models/activity.model.ts b/backend/src/database/models/activity.model.ts
@@ -3,6 +3,7 @@ import { locationSchema } from './location.model';
 import { ActivityType } from '../../types/Activity.types';
 import { ValidationException } from '../../exceptions/ValidationException';
 import { getTagIds } from './tag.model';
+import { CategoryType } from '../../types/Category.types';
 
 const activitySchema = new Schema(
   {
@@ -24,7 +25,7 @@ const activitySchema = new Schema(
       min: 0,
     },
     category: {
-      type: String,
+      type: Schema.Types.ObjectId,
       required: true,
     },
     tags: {

diff --git a/backend/src/types/Activity.types.ts b/backend/src/types/Activity.types.ts
@@ -1,14 +1,15 @@
 import { LocationType } from './Location.types';
 import { TagType } from './Tag.types';
+import { CategoryType } from './Category.types';
 
 export interface ActivityType {
   date: string;
   time: string;
   location: LocationType;
   price: number;
-  category: string;
+  category: CategoryType;
   tags: TagType[];
-  specialDiscounts?: Number;
+  specialDiscounts: Number;
   bookingOpen: boolean;
 }