quick test data model update

Sensor-Electronic-Technology · Jun 29, 2024 · 186bde0 · 186bde0
1 parent bab212f
commit 186bde0
Show file tree

Hide file tree

Showing 18 changed files with 1,008 additions and 842 deletions.
diff --git a/QuickTest.Api/Endpoints/Get/Excel/Single/GetExcelResultsEndpoint.cs b/QuickTest.Api/Endpoints/Get/Excel/Single/GetExcelResultsEndpoint.cs
@@ -24,7 +24,7 @@ public override async Task HandleAsync(GetResultRequest request, CancellationTok
         if (string.IsNullOrEmpty(request.WaferId)) {
             ThrowError("WaferId cannot be null or empty");
         }
-        var rows = await this._qtDataService.GetResult(request.WaferId,(MeasurementType)request.MeasurementType);
+        var rows = await this._qtDataService.GetResultV2(request.WaferId,(MeasurementType)request.MeasurementType);
         await SendAsync(new GetResultExcelResponse() { Row = rows }, cancellation: cancellationToken);
     }
 }
diff --git a/QuickTest.Api/Endpoints/PutEndpoint/InsertMeasurementEndpoint.cs b/QuickTest.Api/Endpoints/PutEndpoint/InsertMeasurementEndpoint.cs
@@ -1,7 +1,7 @@
 using FastEndpoints;
 using QuickTest.Data.Constants;
-using QuickTest.Data.Contracts.Requests.Push;
-using QuickTest.Data.Contracts.Responses.Push;
+using QuickTest.Data.Contracts.Requests.Put;
+using QuickTest.Data.Contracts.Responses.Put;
 using QuickTest.Data.Models.Measurements;
 using QuickTest.Infrastructure.Services;
 
@@ -24,11 +24,10 @@ public override async Task HandleAsync(InsertMeasurementRequest req, Cancellatio
         if(req.Measurement == null) {
             ThrowError("Measurement cannot be null");
         }
-
         if (string.IsNullOrEmpty(req.Measurement.WaferId)) {
             ThrowError("WaferId cannot be null or empty");
         }
-        var result = await this._qtDataService.InsertMeasurement(new QtMeasurement() {
+        /*var result = await this._qtDataService.InsertMeasurement(new QtMeasurement() {
             MeasurementType = (MeasurementType)req.Measurement.MeasurementType,
             Current= req.Measurement.Current,
             Voltage= req.Measurement.Voltage,
@@ -37,7 +36,8 @@ public override async Task HandleAsync(InsertMeasurementRequest req, Cancellatio
             Knee=req.Measurement.Knee,
             Ir = req.Measurement.Ir,
             Wl= req.Measurement.Wl
-        });
+        });*/
+        var result = await this._qtDataService.InsertMeasurement(req.Measurement);
         await SendAsync(new InsertMeasurementResponse() { Success = result },cancellation:ct);
     }
 }
diff --git a/QuickTest.Api/Endpoints/PutEndpoint/MarkTestedEndpoint.cs b/QuickTest.Api/Endpoints/PutEndpoint/MarkTestedEndpoint.cs
@@ -0,0 +1,23 @@
+using FastEndpoints;
+using QuickTest.Data.Constants;
+using QuickTest.Data.Contracts.Requests.Put;
+using QuickTest.Infrastructure.Services;
+
+namespace QuickTest.Api.Endpoints.PutEndpoint;
+
+public class MarkTestedEndpoint:Endpoint<MarkTestedRequest,EmptyResponse>  {
+    private readonly QuickTestDataService _qtDataService;
+
+    public MarkTestedEndpoint(QuickTestDataService qtDataService) {
+        this._qtDataService = qtDataService;
+    }
+
+    public override void Configure() {
+        Put(QtApiPaths.MarkTestedPath);
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(MarkTestedRequest request, CancellationToken cancellationToken) {
+
+    }
+}
diff --git a/QuickTest.Api/Processors/InsertMeasurementPostProcessor.cs b/QuickTest.Api/Processors/InsertMeasurementPostProcessor.cs
@@ -0,0 +1,26 @@
+using FastEndpoints;
+using QuickTest.Data.Contracts.Requests.Put;
+using QuickTest.Data.Contracts.Responses.Put;
+using QuickTest.Data.Models.Measurements;
+using QuickTest.Infrastructure.Services;
+
+namespace QuickTest.Api.Processors;
+
+/*public class InsertMeasurementPostProcessor:IPostProcessor<InsertMeasurementRequest, InsertMeasurementResponse>{
+    public async Task PostProcessAsync(IPostProcessorContext<InsertMeasurementRequest, InsertMeasurementResponse> context, 
+        CancellationToken ct) {
+        var dataService = context.HttpContext.Resolve<QuickTestDataService>();
+        if(context.Request.Measurement != null && context.Response!=null && context.Response.Success) {
+            await dataService.PostInsertMeasurement(new QtMeasurement() {
+                MeasurementType = (MeasurementType)context.Request.Measurement.MeasurementType,
+                Current = context.Request.Measurement.Current,
+                Voltage = context.Request.Measurement.Voltage,
+                WaferId = context.Request.Measurement.WaferId!,
+                Power = context.Request.Measurement.Power,
+                Knee = context.Request.Measurement.Knee,
+                Ir = context.Request.Measurement.Ir,
+                Wl = context.Request.Measurement.Wl
+            });
+        }
+    }
+}*/
diff --git a/QuickTest.Api/QuickTest.Api.http b/QuickTest.Api/QuickTest.Api.http
@@ -6,7 +6,7 @@ GET {{QuickTest.Api_HostAddress}}/api/qt_results/B03-2615-07
 Accept: text/plain
 
 ### GET request to get initial data
-GET http://172.20.4.206/api/results/all/excel/B03-2615-07?1
+GET {{QuickTest.Api_HostAddress}}/api/results/all/excel/B01-3KNB01B14-14?1
 Accept: text/plain
 
 ### GET request to get initial data
@@ -30,18 +30,22 @@ GET {{QuickTest.Api_HostAddress}}/api/map/2
 Accept: application/json
 
 ### GET request to get all wafer pads-external
-GET http://172.20.4.206/api/map/2
+GET {{QuickTest.Api_HostAddress}}/api/map/2
 Accept: application/json
 
 ### GET request test
-GET http://172.20.4.206/api/results/excel/B06-1393-?1
+GET {{QuickTest.Api_HostAddress}}/api/results/excel/B01-4110-14?1
 Accept: application/json
 
 ### GET request test
-GET {{Remote.Api_HostAddress}}/api/quick-test/exists/B01-3277-28
+GET {{Remote.Api_HostAddress}}/api/quick-test/exists/B01-4110-14
 Accept: application/json
 
 ### GET request test
 
 GET {{Remote.Api_HostAddress}}/api/map/2
 Accept: application/json
+
+### Get Available Pads
+GET {{QuickTest.Api_HostAddress}}/api/pads/available/B01-4110-14
+Accept: application/json
diff --git a/QuickTest.Data/Constants/QtApiPaths.cs b/QuickTest.Data/Constants/QtApiPaths.cs
@@ -22,7 +22,9 @@ public static class QtApiPaths {
     public static string GetQuickTestsPath => "/api/quick-tests/";
     public static string CreateQuickTestPath => "/api/quick-tests/create/";
     public static string CheckQuickTestPath => "/api/quick-tests/check/";
+    public static string MarkTestedPath => "/api/quick-tests/mark-tested/";
     public static string InsertMeasurementPath => "/api/results/insert/";
+
     public static string MarkInitialCompleted => "/api/results/initial/mark-completed/";
     public static string MarkFinalCompleted => "/api/results/final/mark-completed/";
 

diff --git a/...Requests/Push/InsertMeasurementRequest.cs → .../Requests/Put/InsertMeasurementRequest.cs b/...Requests/Push/InsertMeasurementRequest.cs → .../Requests/Put/InsertMeasurementRequest.cs
@@ -1,6 +1,6 @@
 using QuickTest.Data.DataTransfer;
 
-namespace QuickTest.Data.Contracts.Requests.Push;
+namespace QuickTest.Data.Contracts.Requests.Put;
 
 public class InsertMeasurementRequest {
     public MeasurementDto? Measurement { get; set; }

diff --git a/QuickTest.Data/Contracts/Requests/Put/MarkTestedRequest.cs b/QuickTest.Data/Contracts/Requests/Put/MarkTestedRequest.cs
@@ -0,0 +1,6 @@
+namespace QuickTest.Data.Contracts.Requests.Put;
+
+public class MarkTestedRequest {
+    public string WaferId { get; set; }
+    public int MeasurementType { get; set; }
+}
diff --git a/...sponses/Push/InsertMeasurementResponse.cs → ...esponses/Put/InsertMeasurementResponse.cs b/...sponses/Push/InsertMeasurementResponse.cs → ...esponses/Put/InsertMeasurementResponse.cs
@@ -1,4 +1,4 @@
-namespace QuickTest.Data.Contracts.Responses.Push;
+namespace QuickTest.Data.Contracts.Responses.Put;
 
 public class InsertMeasurementResponse {
     public bool Success { get; set; }

diff --git a/QuickTest.Data/Mappers/MeasurementMapper.cs b/QuickTest.Data/Mappers/MeasurementMapper.cs
@@ -1,13 +1,13 @@
 using FastEndpoints;
-using QuickTest.Data.Contracts.Requests.Push;
-using QuickTest.Data.Contracts.Responses.Push;
+using QuickTest.Data.Contracts.Requests.Put;
+using QuickTest.Data.Contracts.Responses.Put;
 using QuickTest.Data.DataTransfer;
 using QuickTest.Data.Models.Measurements;
 using QuickTest.Data.Models.Wafers.Enums;
 
 namespace QuickTest.Data.Mappers;
 
-public class MeasurementMapper:Mapper<InsertMeasurementRequest,InsertMeasurementResponse,QtMeasurement?> {
+/*public class MeasurementMapper:Mapper<InsertMeasurementRequest,InsertMeasurementResponse,QtMeasurement?> {
     public override InsertMeasurementResponse FromEntity(QtMeasurement? e) {
         if (e == null) {
             return new InsertMeasurementResponse() {
@@ -43,7 +43,7 @@ public override InsertMeasurementResponse FromEntity(QtMeasurement? e) {
             return measurement;
         } else {
             return null;
-        }*/
+        }#1#
     }
 
     public override QtMeasurement? UpdateEntity(InsertMeasurementRequest r, QtMeasurement? e) {
@@ -71,6 +71,6 @@ public override InsertMeasurementResponse FromEntity(QtMeasurement? e) {
             return e;
         } else {
             return null;
-        }*/
+        }#1#
     }
-}
+}*/
diff --git a/QuickTest.Data/Models/Measurements/MeasurementType.cs b/QuickTest.Data/Models/Measurements/MeasurementType.cs
@@ -9,8 +9,8 @@ public enum MeasurementType:int {
 }
 
 
-public class MeasurementTypeSmart : SmartEnum<MeasurementTypeSmart, int> {
+/*public class MeasurementTypeSmart : SmartEnum<MeasurementTypeSmart, int> {
     public static MeasurementTypeSmart Initial  = new MeasurementTypeSmart(nameof(Initial), 0);
-    public static MeasurementTypeSmart Final  = new MeasurementTypeSmart(nameof(Final), 0);
+    public static MeasurementTypeSmart Final  = new MeasurementTypeSmart(nameof(Final), 1);
     public MeasurementTypeSmart(String name, int value) : base(name, value) { }
-}
+}*/
diff --git a/QuickTest.Data/Models/Measurements/QtMeasurement.cs b/QuickTest.Data/Models/Measurements/QtMeasurement.cs
@@ -18,12 +18,22 @@ public abstract class Measurement {
     public ObjectId _id { get; set; }
     public string WaferId { get; set; }
     public ObjectId QuickTestResultId { get; set; }
-    public string? Pad { get; set; }
+    //public string? Pad { get; set; }
     public MeasurementType MeasurementType { get; set; }
     public int Current { get; set; }
 }
 
 public class QtMeasurement:Measurement {
+    public Dictionary<string,PadMeasurement> Measurements { get; set; } = new Dictionary<string, PadMeasurement>();
+    /*public double Wl { get; set; }
+    public double Power { get; set; }
+    public double Voltage { get; set; }
+    public double Knee { get; set; }
+    public double Ir { get; set; }*/
+}
+
+public class PadMeasurement {
+    public string ActualPad { get; set; }
     public double Wl { get; set; }
     public double Power { get; set; }
     public double Voltage { get; set; }

diff --git a/QuickTest.Data/Models/Measurements/QuickTestPadData.cs b/QuickTest.Data/Models/Measurements/QuickTestPadData.cs
@@ -0,0 +1,3 @@
+namespace QuickTest.Data.Models.Measurements;
+
+
diff --git a/QuickTest.Data/Models/Measurements/Spectrum.cs b/QuickTest.Data/Models/Measurements/Spectrum.cs
@@ -4,6 +4,11 @@
 namespace QuickTest.Data.Models.Measurements;
 
 public class Spectrum:Measurement {
+    public Dictionary<string, PadSpectrumMeasurement> Measurements { get; set; } = new();
+}
+
+public class PadSpectrumMeasurement {
+    public string ActualPad { get; set; }
     public List<double>? Wl { get; set; }
     public List<double>? Intensity { get; set; }
 }