Include substrates to reef check surveys

aqualinkorg · Nov 26, 2024 · fffe1cc · fffe1cc
1 parent 0c5a6bb
commit fffe1cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/api/src/reef-check-surveys/reef-check-surveys.entity.ts b/packages/api/src/reef-check-surveys/reef-check-surveys.entity.ts
@@ -12,6 +12,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Site } from '../sites/sites.entity';
 import { ReefCheckSite } from '../reef-check-sites/reef-check-sites.entity';
 import { ReefCheckOrganism } from '../reef-check-organisms/reef-check-organisms.entity';
+import { ReefCheckSubstrate } from '../reef-check-substrates/reef-check-substrates.entity';
 
 @Entity()
 export class ReefCheckSurvey {
@@ -43,6 +44,10 @@ export class ReefCheckSurvey {
   @OneToMany(() => ReefCheckOrganism, (organism) => organism.survey)
   organisms: ReefCheckOrganism[];
 
+  @ApiProperty()
+  @OneToMany(() => ReefCheckSubstrate, (substrate) => substrate.survey)
+  substrates: ReefCheckSubstrate[];
+
   @ApiProperty()
   @Column({ nullable: true })
   date: Date;

diff --git a/packages/api/src/reef-check-surveys/reef-check-surveys.service.ts b/packages/api/src/reef-check-surveys/reef-check-surveys.service.ts
@@ -16,14 +16,14 @@ export class ReefCheckSurveysService {
   async find(reefCheckSiteId: string): Promise<ReefCheckSurvey[]> {
     return this.reefCheckSurveyRepository.find({
       where: { reefCheckSiteId },
-      relations: ['organisms'],
+      relations: ['organisms', 'substrates', 'reefCheckSite'],
     });
   }
 
   async findOne(id: string): Promise<ReefCheckSurvey> {
     const reefCheckSurvey = await this.reefCheckSurveyRepository.findOne({
       where: { id },
-      relations: ['organisms', 'reefCheckSite'],
+      relations: ['organisms', 'substrates', 'reefCheckSite'],
       // Using getAllColumns to include VirtualColumns - they are not included by default
       select: getAllColumns(this.reefCheckSurveyRepository),
     });