Merge pull request 'Обновление PROD состояния кодовой базой dev контура' (#7) from dev into main

Reviewed-on: #7

migrations/0002_current_value_nullable.sql

@@ -0,0 +1,2 @@
+ALTER TABLE current
+  ALTER COLUMN value DROP NOT NULL;

src/common/is-nullable-number.decorator.ts

@@ -0,0 +1,11 @@
+import { applyDecorators } from '@nestjs/common';
+import { Transform } from 'class-transformer';
+import { IsNumber, ValidateIf, ValidationOptions } from 'class-validator';
+
+export function IsNullableNumber(options?: ValidationOptions): PropertyDecorator {
+  return applyDecorators(
+    Transform(({ value }) => (value === null ? null : Number(value))),
+    ValidateIf((_, value) => value !== null),
+    IsNumber({}, options),
+  );
+}

src/current/current.types.ts

@@ -1,7 +1,7 @@
 export type CurrentRow = {
   edge: string;
   tag: string;
-  value: number;
+  value: number | null;
   createdAt: Date;
   updatedAt: Date;
   name: string | null;

src/current/dto/current-response.dto.ts

@@ -1,7 +1,7 @@
 export type CurrentItemDto = {
   edge: string;
   tag: string;
-  value: number;
+  value: number | null;
   createdAt: Date;
   updatedAt: Date;
   time: Date;

src/ingest/dto/ingest-edge-values.dto.ts

@@ -5,5 +5,5 @@ export class IngestEdgeValuesDto {
   timestamp!: string;
 
   @IsObject()
-  values!: Record<string, number>;
+  values!: Record<string, number | null>;
 }

src/ingest/dto/ingest-point.dto.ts

@@ -1,5 +1,5 @@
-import { Type } from 'class-transformer';
-import { IsDateString, IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { IsDateString, IsNotEmpty, IsString } from 'class-validator';
+import { IsNullableNumber } from '../../common/is-nullable-number.decorator';
 
 export class IngestPointDto {
   @IsNotEmpty()
@@ -13,7 +13,6 @@ export class IngestPointDto {
   @IsDateString()
   timestamp!: string;
 
-  @Type(() => Number)
-  @IsNumber()
-  value!: number;
+  @IsNullableNumber()
+  value!: number | null;
 }

src/ingest/ingest.controller.ts

@@ -22,7 +22,7 @@ export class IngestController {
     const points = Object.entries(body.values).map(([tag, value]) => ({
       edge,
       tag,
-      value: Number(value),
+      value,
       timestamp: body.timestamp,
     }));
 

src/ingest/ingest.service.ts

@@ -10,8 +10,9 @@ type IngestResult = {
 export class IngestService {
   constructor(private readonly db: DbService) {}
 
-  /** Пишет одну входящую точку в history и обновляет текущий снимок current для UI/SSE. */
+  /** Пишет числовую точку в history и всегда обновляет текущий снимок current для UI/SSE. */
   async ingestPoint(point: IngestPointDto): Promise<IngestResult> {
+    if (point.value !== null) {
       await this.db.query(
         `
           INSERT INTO history (timestamp, edge, tag, value)
@@ -19,6 +20,7 @@ export class IngestService {
         `,
         [point.timestamp, point.edge, point.tag, point.value],
       );
+    }
 
     await this.db.query(
       `