fix: project attributes

Vizzuality · May 5, 2022 · 0c13405 · 0c13405
1 parent 336b623
commit 0c13405
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/api/apps/geoprocessing/src/export/pieces-exporters/project-metadata.piece-exporter.ts b/api/apps/geoprocessing/src/export/pieces-exporters/project-metadata.piece-exporter.ts
@@ -39,9 +39,10 @@ export class ProjectMetadataPieceExporter implements ExportPieceProcessor {
       name: string;
       description: string;
       planning_unit_grid_shape: PlanningUnitGridShape;
+      metadata: Record<string, unknown> | null;
     }[] = await this.entityManager
       .createQueryBuilder()
-      .select(['name', 'description', 'planning_unit_grid_shape'])
+      .select(['name', 'description', 'planning_unit_grid_shape', 'metadata'])
       .from('projects', 'p')
       .where('id = :projectId', { projectId })
       .execute();
@@ -56,6 +57,7 @@ export class ProjectMetadataPieceExporter implements ExportPieceProcessor {
       name: projectData.name,
       description: projectData.description,
       planningUnitGridShape: projectData.planning_unit_grid_shape,
+      metadata: projectData.metadata ?? undefined,
     };
 
     const relativePath = ClonePieceRelativePathResolver.resolveFor(

diff --git a/api/apps/geoprocessing/src/import/pieces-importers/project-metadata.piece-importer.ts b/api/apps/geoprocessing/src/import/pieces-importers/project-metadata.piece-importer.ts
@@ -43,6 +43,7 @@ export class ProjectMetadataPieceImporter implements ImportPieceProcessor {
     projectId: string,
     organizationId: string,
     data: ProjectMetadataContent,
+    ownerId: string,
   ) {
     return em
       .createQueryBuilder()
@@ -54,6 +55,8 @@ export class ProjectMetadataPieceImporter implements ImportPieceProcessor {
         description: data.description,
         organization_id: organizationId,
         planning_unit_grid_shape: data.planningUnitGridShape,
+        metadata: data.metadata,
+        created_by: ownerId,
       })
       .execute();
   }
@@ -62,13 +65,16 @@ export class ProjectMetadataPieceImporter implements ImportPieceProcessor {
     em: EntityManager,
     projectId: string,
     data: ProjectMetadataContent,
+    ownerId: string,
   ) {
     return em
       .createQueryBuilder()
       .update('projects')
       .set({
         description: data.description,
         planning_unit_grid_shape: data.planningUnitGridShape,
+        metadata: data.metadata,
+        created_by: ownerId,
       })
       .where('id = :projectId', { projectId })
       .execute();
@@ -123,13 +129,14 @@ export class ProjectMetadataPieceImporter implements ImportPieceProcessor {
         projectId,
       );
       if (projectAlreadyCreated) {
-        await this.updateProject(em, projectId, projectMetadata);
+        await this.updateProject(em, projectId, projectMetadata, ownerId);
       } else {
         await this.createProject(
           em,
           projectId,
           organizationId,
           projectMetadata,
+          ownerId,
         );
       }
 

diff --git a/...sing/test/integration/cloning/piece-exporters/project-metadata.piece-exporter.e2e-spec.ts b/...sing/test/integration/cloning/piece-exporters/project-metadata.piece-exporter.e2e-spec.ts
@@ -70,9 +70,12 @@ const getFixtures = async () => {
     getEntityManagerToken(geoprocessingConnections.apiDB),
   );
   const fileRepository = sandbox.get(CloningFilesRepository);
+  const metadata = { foo: 'bar' };
+
   const expectedContent: ProjectMetadataContent = {
     name: `test project - ${projectId}`,
     planningUnitGridShape: PlanningUnitGridShape.Square,
+    metadata,
   };
 
   return {
@@ -96,7 +99,9 @@ const getFixtures = async () => {
       };
     },
     GivenProjectExist: async () => {
-      return GivenProjectExists(apiEntityManager, projectId, organizationId);
+      return GivenProjectExists(apiEntityManager, projectId, organizationId, {
+        metadata,
+      });
     },
     WhenPieceExporterIsInvoked: (input: ExportJobInput) => {
       return {

diff --git a/...sing/test/integration/cloning/piece-importers/project-metadata.piece-importer.e2e-spec.ts b/...sing/test/integration/cloning/piece-importers/project-metadata.piece-importer.e2e-spec.ts
@@ -30,6 +30,8 @@ interface ProjectSelectResult {
   name: string;
   description: string;
   planning_unit_grid_shape: PlanningUnitGridShape;
+  metadata: Record<string, unknown> | null;
+  created_by: string;
 }
 
 let fixtures: FixtureType<typeof getFixtures>;
@@ -113,10 +115,13 @@ const getFixtures = async () => {
   const projectName = `test project - ${projectId}`;
   const copyProjectName = projectName + ' - copy';
 
+  const expectedMetadata = { foo: 'bar' };
+
   const validProjectMetadataFileContent: ProjectMetadataContent = {
     name: projectName,
     description: 'project description',
     planningUnitGridShape: PlanningUnitGridShape.Hexagon,
+    metadata: expectedMetadata,
   };
 
   return {
@@ -210,6 +215,8 @@ const getFixtures = async () => {
           expect(project.planning_unit_grid_shape).toEqual(
             validProjectMetadataFileContent.planningUnitGridShape,
           );
+          expect(project.metadata).toMatchObject(expectedMetadata);
+          expect(project.created_by).toEqual(userId);
         },
       };
     },

diff --git a/api/libs/cloning/src/infrastructure/clone-piece-data/project-metadata.ts b/api/libs/cloning/src/infrastructure/clone-piece-data/project-metadata.ts
@@ -4,6 +4,7 @@ export type ProjectMetadataContent = {
   name: string;
   description?: string;
   planningUnitGridShape?: PlanningUnitGridShape;
+  metadata?: Record<string, unknown>;
 };
 
 export const projectMetadataRelativePath = 'project-metadata.json';