[TM-2411] Merge remote-tracking branch 'origin/staging' into epic/TM-2411-forms

# Conflicts:
#	apps/research-service/src/site-polygons/polygon-geometry-creation.service.ts

Author: roguenet

apps/research-service/src/site-polygons/dto/site-polygon.dto.ts

@@ -182,6 +182,9 @@ export class SitePolygonLightDto extends HybridSupportDto {
     description: "Whether the site polygon is active"
   })
   isActive: boolean;
+
+  @ApiProperty({ nullable: true, type: Date })
+  createdAt: Date | null;
 }
 
 @JsonApiDto({ type: "sitePolygons" })

apps/research-service/src/site-polygons/geometry-upload.processor.ts

@@ -12,11 +12,12 @@ import { SitePolygonLightDto } from "./dto/site-polygon.dto";
 import { populateDto } from "@terramatch-microservices/common/dto/json-api-attributes";
 import { ValidationDto } from "../validations/dto/validation.dto";
 import { FeatureCollection } from "geojson";
-import { Feature, CreateSitePolygonRequestDto, AttributeChangesDto } from "./dto/create-site-polygon-request.dto";
+import { Feature, CreateSitePolygonRequestDto } from "./dto/create-site-polygon-request.dto";
 import { SitePolygon } from "@terramatch-microservices/database/entities";
 import { Op } from "sequelize";
 import { BadRequestException } from "@nestjs/common";
 import { validateSitePolygonProperties } from "./utils/site-polygon-property-validator";
+import { convertPropertiesToAttributeChanges } from "./utils/attribute-changes-converter";
 import { CriteriaId, ValidationType } from "@terramatch-microservices/database/constants";
 
 export interface GeometryUploadJobData {
@@ -247,7 +248,7 @@ export class GeometryUploadProcessor extends DelayedJobWorker<GeometryUploadJobD
           }
 
           const validatedProperties = validateSitePolygonProperties(allProperties);
-          const attributeChanges = this.convertPropertiesToAttributeChanges(validatedProperties);
+          const attributeChanges = convertPropertiesToAttributeChanges(validatedProperties);
 
           const uploadedPolyName = attributeChanges.polyName ?? attributeChanges.poly_name;
           const basePolyName = basePolygon.polyName ?? null;
@@ -318,40 +319,4 @@ export class GeometryUploadProcessor extends DelayedJobWorker<GeometryUploadJobD
       payload: document
     };
   }
-
-  private convertPropertiesToAttributeChanges(properties: Partial<SitePolygon>): AttributeChangesDto {
-    const attributeChanges: AttributeChangesDto = {};
-
-    if (properties.polyName != null) {
-      attributeChanges.polyName = properties.polyName;
-      attributeChanges.poly_name = properties.polyName;
-    }
-
-    if (properties.plantStart != null) {
-      const plantStartString =
-        properties.plantStart instanceof Date ? properties.plantStart.toISOString() : String(properties.plantStart);
-      attributeChanges.plantStart = plantStartString;
-      attributeChanges.plantstart = plantStartString;
-    }
-
-    if (properties.practice != null && properties.practice.length > 0) {
-      attributeChanges.practice = properties.practice;
-    }
-
-    if (properties.targetSys != null) {
-      attributeChanges.targetSys = properties.targetSys;
-      attributeChanges.target_sys = properties.targetSys;
-    }
-
-    if (properties.distr != null && properties.distr.length > 0) {
-      attributeChanges.distr = properties.distr;
-    }
-
-    if (properties.numTrees != null) {
-      attributeChanges.numTrees = properties.numTrees;
-      attributeChanges.num_trees = properties.numTrees;
-    }
-
-    return attributeChanges;
-  }
 }