minor: fixes of unused imports, wrong imports, renaming dto stuff

Vizzuality · Apr 26, 2022 · 12ed10a · 12ed10a
1 parent 4fa4bd3
commit 12ed10a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/api/apps/api/src/modules/published-project/dto/publish-project.dto.ts b/api/apps/api/src/modules/published-project/dto/publish-project.dto.ts
@@ -33,7 +33,7 @@ export class PublishProjectDto {
 
   @IsOptional()
   @ApiPropertyOptional()
-  scenarioId?: string;
+  featuredScenarioId?: string;
 
   @ApiProperty()
   @ValidateNested({ each: true })

diff --git a/api/apps/api/src/modules/published-project/entities/published-project.api.entity.ts b/api/apps/api/src/modules/published-project/entities/published-project.api.entity.ts
@@ -5,7 +5,6 @@ import {
   Creator,
   Resource,
 } from '../dto/create-published-project.dto';
-import { string } from 'fp-ts';
 
 @Entity('published_projects')
 export class PublishedProject {

diff --git a/api/apps/api/src/modules/published-project/published-project.service.ts b/api/apps/api/src/modules/published-project/published-project.service.ts
@@ -13,7 +13,7 @@ import { PublishProjectDto } from './dto/publish-project.dto';
 import { WebshotService } from '@marxan/webshot';
 import { AppConfig } from '@marxan-api/utils/config.utils';
 import { assertDefined } from '@marxan/utils';
-import { isLeft, isRight } from 'fp-ts/lib/These';
+import { isLeft, isRight } from 'fp-ts/lib/Either';
 
 export const notFound = Symbol(`project not found`);
 export const accessDenied = Symbol(`not allowed`);
@@ -72,11 +72,17 @@ export class PublishedProjectService {
 
     const webshotUrl = AppConfig.get('webshot.url') as string;
 
-    const { scenarioId, config, ...projectWithoutScenario } = projectToPublish;
-    assertDefined(scenarioId);
+    const {
+      featuredScenarioId,
+      config,
+      ...projectWithoutScenario
+    } = projectToPublish;
+
+    assertDefined(featuredScenarioId);
     assertDefined(config);
+
     const pngData = await this.webshotService.getPublishedProjectsImage(
-      scenarioId,
+      featuredScenarioId,
       id,
       {
         ...config,

diff --git a/api/apps/api/test/project/projects.fixtures.ts b/api/apps/api/test/project/projects.fixtures.ts
@@ -285,7 +285,7 @@ export const getFixtures = async () => {
           creators: [{ displayName: 'fake name', avatarDataUrl: blmImageMock }],
           resources: [{ title: 'fake url', url: 'http://www.example.com' }],
           config: { baseUrl: 'example/png', cookie: 'randomCookie' },
-          scenarioId,
+          featuredScenarioId: scenarioId,
         })
         .set('Authorization', `Bearer ${randomUserToken}`),
     WhenUnpublishingAProjectAsProjectOwner: async (projectId: string) =>