fix

Sensor-Electronic-Technology · Jun 30, 2024 · 61c8464 · 61c8464
1 parent 186bde0
commit 61c8464
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/QuickTest.Api/QuickTest.Api.http b/QuickTest.Api/QuickTest.Api.http
@@ -47,5 +47,9 @@ GET {{Remote.Api_HostAddress}}/api/map/2
 Accept: application/json
 
 ### Get Available Pads
-GET {{QuickTest.Api_HostAddress}}/api/pads/available/B01-4110-14
+GET {{Remote.Api_HostAddress}}/api/pads/available/B01-4110-14
+Accept: application/json
+
+### Get Wafer List
+GET {{Remote.Api_HostAddress}}/api/quick-tests/list-since/1-1-2024
 Accept: application/json
diff --git a/QuickTest.Data/QuickTest.Data.csproj b/QuickTest.Data/QuickTest.Data.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>QuickTest.Data</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Andrew Elmendorf</Authors>
     <Company>Sensor Electronic Technology</Company>
     <PackageDescription>Data for QuickTest</PackageDescription>

diff --git a/QuickTest.Infrastructure/Services/WaferDataService.cs b/QuickTest.Infrastructure/Services/WaferDataService.cs
@@ -16,15 +16,15 @@ public class WaferDataService {
 
     public WaferDataService(ILogger<WaferDataService> logger, IMongoClient mongoClient) {
         this._logger = logger;
-        //var database = mongoClient.GetDatabase("quick_test_db");
-        var database=mongoClient.GetDatabase("quick_test_db_v2");
+        var database = mongoClient.GetDatabase("quick_test_db");
+        //var database=mongoClient.GetDatabase("quick_test_db_v2");
         this._waferPadCollection = database.GetCollection<WaferPad>("wafer_pads");
         this._waferMapCollection = database.GetCollection<WaferMap>("wafer_maps");
         this._labviewWaferMapCollection = database.GetCollection<LvWaferMap>("lv_wafer_maps");
     }
 
     public WaferDataService(IMongoClient mongoClient) {
-        var database = mongoClient.GetDatabase("quick_test_db_v2");
+        var database = mongoClient.GetDatabase("quick_test_db");
         this._waferPadCollection = database.GetCollection<WaferPad>("wafer_pads");
         this._waferMapCollection = database.GetCollection<WaferMap>("wafer_maps");
         this._labviewWaferMapCollection = database.GetCollection<LvWaferMap>("lv_wafer_maps");

diff --git a/QuickTest.MigrateLegacy/Program.cs b/QuickTest.MigrateLegacy/Program.cs
@@ -34,7 +34,7 @@
 //await TestQtV2();
 //await GetInitialResults();
 
-//await Migrate();
+await Migrate();
 //await CreateHelperCollections();
 
 //await TestGetWaferPads();
@@ -57,9 +57,7 @@
 async Task Migrate() {
     var context = new EpiContext();
     var clientWork=new MongoClient("mongodb://172.20.3.41:27017");
-    //var clientPi=new MongoClient("mongodb://192.168.68.112:27017");
-    var databaseWork=clientWork.GetDatabase("quick_test_db_v2");
-    //var databasePi=clientPi.GetDatabase("quick_test_db");
+    var databaseWork=clientWork.GetDatabase("quick_test_db");
     var qtCollectionWork=databaseWork.GetCollection<QuickTestResult>("quick_test");
     var initMeasureCollection=databaseWork.GetCollection<QtMeasurement>("init_measurements");
     var finalMeasureCollection=databaseWork.GetCollection<QtMeasurement>("final_measurements");
@@ -68,9 +66,9 @@ async Task Migrate() {
     await qtCollectionWork.Indexes.CreateOneAsync(new CreateIndexModel<QuickTestResult>(Builders<QuickTestResult>.IndexKeys.Ascending(e => e.WaferId)));
 
     Console.WriteLine("Starting Migration...");
-    var start=new DateTime(2024,1,1);
-    var wafers=await context.EpiDataInitials.Where(e=>e.DateTime>=start).Select(e=>e.WaferId)
-        .Distinct().ToListAsync();
+    var wafers=await context.EpiDataInitials.Select(e=>e.WaferId)
+        .Distinct()
+        .ToListAsync();
     Console.WriteLine($"Wafer Count:{wafers.Count()}");
     int saveCounter=0;
     int count = 0;
@@ -111,7 +109,7 @@ async Task Migrate() {
         saveCounter++;
         count++;
         Console.WriteLine($"Created QuickTestResult for wafer: {wafer} Count:{count}");
-        if(saveCounter>=2) {
+        if(saveCounter>=100) {
             Console.WriteLine("Saving 100 records...");
             await qtCollectionWork.InsertManyAsync(results);
             if(initMeasureResults.Any()) {
@@ -148,7 +146,7 @@ async Task Migrate() {
 
 async Task CreateHelperCollections() {
     var client=new MongoClient("mongodb://172.20.3.41:27017");
-    var database=client.GetDatabase("quick_test_db_v2");
+    var database=client.GetDatabase("quick_test_db");
     var currentCollection = database.GetCollection<MeasurementCurrent>("measure_current");
     await currentCollection.Indexes.CreateOneAsync(new CreateIndexModel<MeasurementCurrent>(Builders<MeasurementCurrent>.IndexKeys.Ascending(e => e.Name)));
     var stationCollection = database.GetCollection<ProbeStation>("probe_stations");

diff --git a/QuickTest.Testing/Program.cs b/QuickTest.Testing/Program.cs
@@ -29,9 +29,9 @@
 
 //await CloneDatabase();
 
-/*await CreateWaferPadsV2();
+await CreateWaferPadsV2();
 await CreateFourInchWaferPadsV2();
-await CreateWaferMaps();*/
+await CreateWaferMaps();
 
 /*async Task GetAvailablePads() {
     var mongoClient = new MongoClient("mongodb://172.20.3.41:27017/");