filter types

backend/prisma/schema.prisma

@@ -10,15 +10,16 @@ datasource db {
 }
 
 model recreation_resource {
-  rec_resource_id        String                @id @db.VarChar(200)
-  name                   String?               @db.VarChar(200)
-  description            String?               @db.VarChar(5000)
-  closest_community      String?               @db.VarChar(200)
-  display_on_public_site Boolean?              @default(false)
-  rec_resource_type      String?               @db.VarChar(50)
+  rec_resource_id               String                        @id @db.VarChar(200)
+  name                          String?                       @db.VarChar(200)
+  description                   String?                       @db.VarChar(5000)
+  closest_community                 String?                       @db.VarChar(200)
+  display_on_public_site        Boolean?                      @default(false)
+  rec_resource_type             String                        @db.VarChar(10)
   campsite_count         Int?                  @default(0)
-  recreation_activity    recreation_activity[]
-  recreation_status      recreation_status?
+  recreation_activity           recreation_activity[]
+  recreation_resource_type_code recreation_resource_type_code @relation(fields: [rec_resource_type], references: [rec_resource_type_code], onDelete: NoAction, onUpdate: NoAction)
+  recreation_status             recreation_status?
 }
 
 /// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments
@@ -50,3 +51,9 @@ model recreation_status_code {
   description       String              @db.VarChar(120)
   recreation_status recreation_status[]
 }
+
+model recreation_resource_type_code {
+  rec_resource_type_code String                @id @db.VarChar(10)
+  description            String?               @db.VarChar(200)
+  recreation_resource    recreation_resource[]
+}

backend/src/recreation-resource/dto/paginated-recreation-resource.dto.ts

@@ -6,7 +6,7 @@ class FilterOptionDto {
     description: "Unique identifier for the filter option",
     example: 1,
   })
-  id: number;
+  id: string | number;
 
   @ApiProperty({
     description: "Number of matching results for this filter",

backend/src/recreation-resource/dto/recreation-resource.dto.spec.ts

@@ -47,6 +47,7 @@ describe("Recreation DTOs", () => {
         description:
           "A scenic campground nestled in the heart of Evergreen Valley",
         closest_community: "123 Forest Road, Mountain View, CA 94043",
+        rec_resource_type: "RR",
         recreation_activity: [
           {
             recreation_activity_code: 1,
@@ -67,6 +68,9 @@ describe("Recreation DTOs", () => {
       expect(resource.name.length).toBeLessThanOrEqual(100);
       expect(Array.isArray(resource.recreation_activity)).toBeTruthy();
       expect(resource.recreation_status).toBeDefined();
+      expect(resource.description).toBeDefined();
+      expect(resource.closest_community).toBeDefined();
+      expect(resource.rec_resource_type).toBeDefined();
     });
 
     it("should allow null description", () => {
@@ -75,6 +79,7 @@ describe("Recreation DTOs", () => {
         name: "Test Resource",
         description: null,
         closest_community: "Test Location",
+        rec_resource_type: "RR",
         recreation_activity: [],
         recreation_status: {
           status_code: 1,

backend/src/recreation-resource/recreation-resource.controller.spec.ts

@@ -49,6 +49,7 @@ describe("RecreationResourceController", () => {
         closest_community: "Rec site 1 location",
         recreation_activity: [],
         display_on_public_site: true,
+        rec_resource_type: "RR",
         recreation_status: {
           description: "Active",
           comment: "Active",
@@ -79,6 +80,7 @@ describe("RecreationResourceController", () => {
             name: "Rec site 1",
             description: "Rec site 1 description",
             closest_community: "Rec site 1 location",
+            rec_resource_type: "RR",
             recreation_activity: [],
             recreation_status: {
               description: "Active",

backend/src/recreation-resource/recreation-resource.controller.ts

@@ -39,6 +39,12 @@ export class RecreationResourceController {
     type: String,
     description: "Recreation activities",
   })
+  @ApiQuery({
+    name: "type",
+    required: false,
+    type: String,
+    description: "Recreation resource type",
+  })
   @ApiResponse({
     status: 200,
     description: "Resources found",
@@ -50,13 +56,15 @@ export class RecreationResourceController {
     @Query("limit") limit?: number,
     @Query("page") page: number = 1,
     @Query("activities") activities?: string,
+    @Query("type") type?: string,
   ): Promise<PaginatedRecreationResourceDto> {
     const response =
       await this.recreationResourceService.searchRecreationResources(
         page,
         filter ?? "",
         limit ? parseInt(String(limit)) : undefined,
         activities,
+        type,
       );
 
     return response;