Merge pull request #138 from Patowhiz/main

Climsoft preview 1.0.1 release

Author: Patowhiz

back-end/api/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "description": "Climsoft API",
   "author": "Climsoft Foundation",
   "private": true,
@@ -23,6 +23,7 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.2.3",
     "@nestjs/core": "^10.0.0",
+    "@nestjs/event-emitter": "^3.0.1",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/typeorm": "^10.0.0",
     "bcrypt": "^5.1.1",

back-end/api/package.json

@@ -8,9 +8,11 @@ import { UserModule } from './user/user.module';
 import { SettingsModule } from './settings/settings.module';
 import { MigrationsModule } from './migrations/migrations.module';
 import { AppConfig } from './app.config';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 
 @Module({
   imports: [
+    EventEmitterModule.forRoot(),
     UserModule,
     MetadataModule,
     ObservationModule,

back-end/api/src/app.module.ts

@@ -120,6 +120,4 @@ export class MetadataUpdatesController {
     return this.sourcesService.checkUpdates(updatesQueryDto);
   }
 
-
-
 }

back-end/api/src/metadata/metadata-updates/metadata-updates.controller.ts

@@ -46,7 +46,7 @@ import { RegionEntity } from './regions/entities/region.entity';
 import { NetworkAffiliationsController } from './network-affiliations/controllers/network-affiliation.controller';
 import { NetworkAffiliationsService } from './network-affiliations/services/network-affiliations.service';
 import { StationNetworkAffiliationsController } from './stations/controllers/station-network-affiliations.controller';
-import { StationNetworkAffiliationsService } from './stations/services/station-network-affiliations.service';
+import { StationNetworkAffiliationsService } from './stations/services/station-network-affiliations.service'; 
 
 @Module({
     imports: [
@@ -100,7 +100,7 @@ import { StationNetworkAffiliationsService } from './stations/services/station-n
         ElementSubdomainsService,
         ElementTypesService,
         ElementsService,
-        
+
         OrganisationsService,
         NetworkAffiliationsService,
 

back-end/api/src/metadata/metadata.module.ts

@@ -55,5 +55,4 @@ export class SourceTemplatesController {
         return this.sourcesService.delete(id);
     }
 
-
 }

back-end/api/src/metadata/source-templates/controllers/source-templates.controller.ts

@@ -7,14 +7,14 @@ import { SourceTypeEnum } from 'src/metadata/source-templates/enums/source-type.
 import { SourceTemplateEntity } from '../entities/source-template.entity';
 import { MetadataUpdatesQueryDto } from 'src/metadata/metadata-updates/dtos/metadata-updates-query.dto';
 import { MetadataUpdatesDto } from 'src/metadata/metadata-updates/dtos/metadata-updates.dto';
-
-// TODO refactor this service later
+import { EventEmitter2 } from '@nestjs/event-emitter';
 
 @Injectable()
 export class SourceTemplatesService {
 
     constructor(
-        @InjectRepository(SourceTemplateEntity) private  sourceRepo: Repository<SourceTemplateEntity>, 
+        @InjectRepository(SourceTemplateEntity) private sourceRepo: Repository<SourceTemplateEntity>,
+        private eventEmitter: EventEmitter2,
     ) { }
 
 
@@ -93,6 +93,8 @@ export class SourceTemplatesService {
 
         await this.sourceRepo.save(entity);
 
+        this.eventEmitter.emit('source.created', { id: entity.id, dto });
+
         return this.createViewDto(entity);
 
     }
@@ -108,20 +110,25 @@ export class SourceTemplatesService {
         source.parameters = dto.parameters;
         source.entryUserId = userId;
 
-        // TODO. Later Implement logging of changes in the database.
-        return this.sourceRepo.save(source);
+        await this.sourceRepo.save(source);
+
+        this.eventEmitter.emit('source.updated', { id, dto });
+
+        return source;
     }
 
     public async delete(id: number): Promise<number> {
         const source = await this.findEntity(id);
         await this.sourceRepo.remove(source);
+        this.eventEmitter.emit('source.deleted', { id });
         return id;
     }
 
     public async deleteAll(): Promise<boolean> {
         const entities: SourceTemplateEntity[] = await this.sourceRepo.find();
         // Note, don't use .clear() because truncating a table referenced in a foreign key constraint is not supported
         await this.sourceRepo.remove(entities);
+        this.eventEmitter.emit('source.deleted', {});
         return true;
     }
 

back-end/api/src/metadata/source-templates/services/source-templates.service.ts

@@ -17,13 +17,15 @@ import { AuthorisedImportsPipe } from 'src/user/pipes/authorised-imports.pipe';
 import { StationStatusQueryDto } from '../dtos/station-status-query.dto';
 import { StationStatusDataQueryDto } from '../dtos/station-status-data-query.dto';
 import { DataAvailabilitySummaryQueryDto } from '../dtos/data-availability-summary-query.dto';
+import { FormDataEntryCheckService } from '../services/form-data-entry-check.service';
 
 @Controller('observations')
 export class ObservationsController {
   constructor(
     private observationsService: ObservationsService,
     private observationUpload: ObservationImportService,
     private exportObservationsService: ExportObservationsService,
+    private formDataEntryCheckService: FormDataEntryCheckService,
   ) { }
 
   @Get()
@@ -69,14 +71,14 @@ export class ObservationsController {
   @Get('stations-observation-status/:stationid')
   getStationObservationsLast24HoursRecords(
     @Param('stationid', AuthorisedStationsPipe) stationId: string,
-    @Query() stationStatusQuery: StationStatusDataQueryDto) { 
+    @Query() stationStatusQuery: StationStatusDataQueryDto) {
     return this.observationsService.findStationsObservationStatusData(stationId, stationStatusQuery);
   }
 
   @Get('data-availability-status')
   getDataAvailabilityStatus(
     @Query(AuthorisedStationsPipe) query: DataAvailabilitySummaryQueryDto) {
-      return this.observationsService.findDataAvailabilitySummary( query);
+    return this.observationsService.findDataAvailabilitySummary(query);
   }
 
   @Get('generate-export/:templateid')
@@ -98,12 +100,20 @@ export class ObservationsController {
     return await this.exportObservationsService.downloadExport(exportTemplateId, AuthUtil.getLoggedInUser(request).id);
   }
 
-  @Put()
+  @Put('data-entry')
   async bulkPut(
     @Req() request: Request,
-    @Body(AuthorisedStationsPipe, new ParseArrayPipe({ items: CreateObservationDto })) observationDtos: CreateObservationDto[]) {
+    @Body(new ParseArrayPipe({ items: CreateObservationDto })) observationDtos: CreateObservationDto[]) {
+    // Get logged in user
     const user = AuthUtil.getLoggedInUser(request);
+
+    // Validate form data. If any invalid bad request will be thrown
+    await this.formDataEntryCheckService.checkData(observationDtos, user);
+
+    // Save the data
     await this.observationsService.bulkPut(observationDtos, user.id);
+
+    // Return success if all operations are successful
     return { message: "success" };
   }
 

back-end/api/src/observation/controllers/observations.controller.ts

@@ -15,6 +15,7 @@ import { ClimsoftWebToV4SyncService } from './services/climsoft-web-to-v4-sync.s
 import { ExportObservationsService } from './services/export-observations.service';
 import { ClimsoftV4WebSyncSetUpService } from './services/climsoft-v4-web-sync-set-up.service'; 
 import { ClimsoftV4ToWebSyncService } from './services/climsoft-v4-to-web-sync.service';
+import { FormDataEntryCheckService } from './services/form-data-entry-check.service';
 
 @Module({
   imports: [
@@ -37,6 +38,7 @@ import { ClimsoftV4ToWebSyncService } from './services/climsoft-v4-to-web-sync.s
     ClimsoftV4WebSyncSetUpService,
     ClimsoftWebToV4SyncService,
     ClimsoftV4ToWebSyncService,
+    FormDataEntryCheckService,
   ],
 })
 export class ObservationModule { }

back-end/api/src/observation/observation.module.ts

@@ -183,7 +183,7 @@ export class ClimsoftWebToV4SyncService {
             // Execute the batch upsert 
             const results: mariadb.UpsertResult = await connection.batch(upsertStatement, values);
 
-            this.logger.log('V4 insert update status: ' + results);
+            this.logger.log('V4 afftected rows: ' + results.affectedRows);
 
             // As of 03/02/2025, when an existing row is updated MariaDB counts this as a row affected twice
             // Once for detecting the conflict (i.e., attempting to insert)