change event type

Sensor-Electronic-Technology · Jul 9, 2024 · 4ab4289 · 4ab4289
1 parent 70d829c
commit 4ab4289
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 65 deletions.
diff --git a/QuickTest.Api/Endpoints/PutEndpoint/InsertMeasurementEndpoint.cs b/QuickTest.Api/Endpoints/PutEndpoint/InsertMeasurementEndpoint.cs
@@ -55,69 +55,19 @@ await SendAsync(new InsertMeasurementResponse() {
                     Errors =result.FirstError.Description
                 },cancellation:ct);
             } else {
+                await SendAsync(new InsertMeasurementResponse() {
+                    Success = true,
+                    Errors = ""
+                },cancellation:ct);
                 await PublishAsync(
                     new MeasurementInsertedEvent() {
                         SpectrumMeasurements = req.SpectrumMeasurements,
                         WaferId = req.WaferId,
                         MeasurementType = req.MeasurementType,
                         ActualPad = req.ActualPad,
                         PadLocation = req.PadLocation
-                    },Mode.WaitForNone, cancellation: ct);
-                await SendAsync(new InsertMeasurementResponse() {
-                    Success = true,
-                    Errors = ""
-                },cancellation:ct);
+                    },Mode.WaitForAll, cancellation: ct);
             }
         }
     }
-}
-
-/*public class InsertMeasurementEndpoint:Endpoint<InsertMeasurementRequest, InsertMeasurementResponse> {
-    private readonly QuickTestDataService _qtDataService;
-
-    public InsertMeasurementEndpoint(QuickTestDataService qtDataService) {
-        this._qtDataService = qtDataService;
-    }
-
-    public override void Configure() {
-        Put(QtApiPaths.InsertMeasurementPath);
-        AllowAnonymous();
-    }
-
-    public override async Task HandleAsync(InsertMeasurementRequest req, CancellationToken ct) {
-        StringBuilder builder = new StringBuilder();
-        bool error = false;
-        if(string.IsNullOrWhiteSpace(req.WaferId)) {
-            error = true;
-            builder.AppendLine("WaferId cannot be null or empty");
-        }
-        if (string.IsNullOrEmpty(req.PadLocation)) {
-            error = true;
-            builder.AppendLine("PadLocation cannot be null or empty");
-        }
-        if (string.IsNullOrWhiteSpace(req.ActualPad)) {
-            error = true;
-            builder.AppendLine("ActualPad cannot be null or empty");
-        }
-        if (error) {
-            await SendAsync(new InsertMeasurementResponse() {
-                Success = false,
-                Errors=builder.ToString()
-            },cancellation:ct);
-        } else {
-            var result = await this._qtDataService.InsertMeasurement(req);
-            if (result.IsError) {
-                await SendAsync(new InsertMeasurementResponse() {
-                    Success = false,
-                    Errors =result.FirstError.Description
-                },cancellation:ct);
-            } else {
-                await SendAsync(new InsertMeasurementResponse() {
-                    Success = true,
-                    Errors = ""
-                },cancellation:ct);
-            }
-        }
-        
-    }
-}*/
+}
diff --git a/QuickTest.Api/Event/MeasurementInsertedEventHandler.cs b/QuickTest.Api/Event/MeasurementInsertedEventHandler.cs
@@ -17,7 +17,8 @@ public MeasurementInsertedEventHandler(QuickTestDataService qtDataService,ILogge
     }
     public async Task HandleAsync(MeasurementInsertedEvent eventModel, CancellationToken ct) {
         foreach (var measurement in eventModel.SpectrumMeasurements) {
-            await this._qtDataService.InsertSpectrumMeasurement(measurement,(MeasurementType)eventModel.MeasurementType,eventModel.WaferId, eventModel.PadLocation, eventModel.ActualPad);
+            await this._qtDataService.InsertSpectrumMeasurement(measurement,(MeasurementType)eventModel.MeasurementType,
+                eventModel.WaferId, eventModel.PadLocation, eventModel.ActualPad);
             this._logger.LogInformation("Inserted Spectrum Measurement for {WaferId}",eventModel.WaferId);
         }
     }

diff --git a/QuickTest.Infrastructure/Services/QuickTestDataService.cs b/QuickTest.Infrastructure/Services/QuickTestDataService.cs
@@ -101,19 +101,15 @@ public async Task<ErrorOr<bool>> CreateQuickTest(string waferId,int stationId) {
 
     public async Task<ErrorOr<Success>> InsertAllMeasurements(InsertMeasurementRequest request) {
         List<Error> errors = [];
+
         foreach (var measurement in request.Measurements) {
-            var result=await this.InsertMeasurement(measurement,(MeasurementType)request.MeasurementType,request.WaferId!,request.PadLocation!,request.ActualPad!);
+            var result=await this.InsertMeasurement(measurement,
+                (MeasurementType)request.MeasurementType,
+                request.WaferId!,request.PadLocation!,request.ActualPad!);
             if (result.IsError) {
                 errors.Add(result.FirstError);
             }
         }
-
-        /*foreach (var measurement in request.SpectrumMeasurements) {
-            var result=await this.InsertSpectrumMeasurement(measurement,(MeasurementType)request.MeasurementType,request.WaferId!,request.PadLocation!,request.ActualPad!);
-            if (result.IsError) {
-                errors.Add(result.FirstError);
-            }
-        }*/
         return errors.Any() ? errors : Result.Success;
     }