Merge pull request #55 from EveCrystali/dev/DiabetesRiskPrediction---…

…Enhance-prediction-quality-#49

Dev/diabetes risk prediction   enhance prediction quality #49

BackendDiabetesRiskPrediction/Services/ElasticsearchService.cs

@@ -118,6 +118,7 @@ public async Task<int> CountUniqueWordsInNotes(int patientId, HashSet<string> wo
                     continue;
                 }
 
+
                 IEnumerable<string> bodyTokens = analyzeBodyResponse.Tokens.Select(token => token.Token);
 
                 IEnumerable<string> commonWords = bodyTokens.Intersect(analyzedWords);

BackendPatient/Data/DataSeeder.cs

@@ -1,4 +1,5 @@
 using BackendPatient.Models;
+using Microsoft.EntityFrameworkCore;
 namespace BackendPatient.Data;
 
 public class DataSeeder(ApplicationDbContext dbContext)
@@ -12,7 +13,7 @@ public void SeedPatients()
         {
             ("TestNone", "Test", "1966-12-31", "F", "1 Brookside St", "100-222-3333"),
             ("TestBorderline", "Test", "1945-06-24", "M", "2 High St", "200-333-4444"),
-            ("TestInDanger", "Test", "2004-06-18", "M", "3 Club Road", "300-444-5555"),
+            ("TestInDanger", "Test", "2005-06-18", "M", "3 Club Road", "300-444-5555"),
             ("TestEarlyOnset", "Test", "2002-06-28", "F", "4 Valley Dr", "400-555-6666")
         };
 
@@ -34,33 +35,55 @@ public void SeedPatients()
         int batchSize = 10;
         int counter = 0;
 
-        foreach (Patient patient in patientsFormatted)
+        using var transaction = _dbContext.Database.BeginTransaction();
+        try
         {
-            // Avoid duplicate patients
-            if (existingPatients.Exists(p => p.FirstName == patient.FirstName &&
-                                             p.LastName == patient.LastName &&
-                                             p.DateOfBirth == patient.DateOfBirth))
+            SetIdentityInsert("Patients", true);
+
+            foreach (Patient patient in patientsFormatted)
             {
-                Console.WriteLine($"Skipping duplicate patient: {patient.FirstName} {patient.LastName} {patient.DateOfBirth}");
-                continue;
-            }
+                // Avoid duplicate patients
+                if (existingPatients.Exists(p => p.FirstName == patient.FirstName &&
+                                                 p.LastName == patient.LastName &&
+                                                 p.DateOfBirth == patient.DateOfBirth))
+                {
+                    Console.WriteLine($"Skipping duplicate patient: {patient.FirstName} {patient.LastName} {patient.DateOfBirth}");
+                    continue;
+                }
+                patient.Id = counter + 1;
+                _dbContext.Patients.Add(patient);
+                counter++;
 
-            _dbContext.Patients.Add(patient);
-            counter++;
+                // Save every 10 patients (batch size)
+                if (counter % batchSize == 0)
+                {
+                    _dbContext.SaveChanges();
+                    Console.WriteLine($"Saved {counter} patients so far...");
+                }
+            }
 
-            // Save every 10 patients (batch size)
-            if (counter % batchSize == 0)
+            // Save any remaining patients
+            if (counter % batchSize != 0)
             {
                 _dbContext.SaveChanges();
-                Console.WriteLine($"Saved {counter} patients so far...");
+                Console.WriteLine($"Final save, total patients saved: {counter}");
             }
-        }
 
-        // Save any remaining patients
-        if (counter % batchSize != 0)
+            transaction.Commit();
+        }
+        catch
         {
-            _dbContext.SaveChanges();
-            Console.WriteLine($"Final save, total patients saved: {counter}");
+            transaction.Rollback();
+            throw;
         }
+
+    }
+
+    private void SetIdentityInsert(string tableName, bool enable = true)
+    {
+        string sql = enable
+            ? $"SET IDENTITY_INSERT {tableName} ON;"
+            : $"SET IDENTITY_INSERT {tableName} OFF;";
+        _dbContext.Database.ExecuteSqlRaw(sql);
     }
 }

Frontend/Controllers/PatientsController.cs

@@ -169,7 +169,6 @@ public async Task<IActionResult> Edit(int id)
     }
 
     [HttpPost("edit/{id:int}")]
-    // TODO: Cette page n’est pas disponible pour le moment Si le problème persiste, contactez le propriétaire du site. HTTP ERROR 405
     public async Task<IActionResult> Edit(Patient patient)
     {
         if (ModelState.IsValid)

docker-compose.yml

@@ -105,7 +105,6 @@ services:
         condition: service_healthy
     networks:
       - elastic
-    command: [ "sh", "/mongodb/wait-for-mongo.sh", "/docker-entrypoint.sh" ]
 
   apigateway:
     container_name: apigateway

elasticsearch/config/create_index.json

@@ -10,6 +10,7 @@
             "lowercase",
             "french_stem",
             "asciifolding",
+            "synonym_filter",
             "french_stop"
           ]
         }
@@ -27,11 +28,17 @@
       "filter": {
         "french_stem": {
           "type": "stemmer",
-          "language": "light_french"
+          "language": "french"
         },
         "french_stop": {
           "type": "stop",
           "stopwords": "_french_" 
+        },
+        "synonym_filter": {
+          "type": "synonym_graph",
+          "synonyms": [
+            "hémoglobine a1c => hemoglobine_a1c"
+          ]
         }
       }
     }

elasticsearch/config/notes_index_template.json

@@ -14,6 +14,7 @@
               "lowercase",
               "french_stem",
               "asciifolding",
+              "synonym_filter",
               "french_stop"
             ]
           }
@@ -31,11 +32,17 @@
         "filter": {
           "french_stem": {
             "type": "stemmer",
-            "language": "light_french"
+            "language": "french"
           },
           "french_stop": {
             "type": "stop",
             "stopwords": "_french_"
+          },
+          "synonym_filter": {
+            "type": "synonym_graph",
+            "synonyms": [
+              "hémoglobine a1c => hemoglobine_a1c"
+            ]
           }
         }
       }

mongodb/mongo-express.Dockerfile

@@ -1,5 +1 @@
-FROM mongo-express
-
-COPY /wait-for-mongo.sh /wait-for-mongo.sh
-
-RUN chmod +x /wait-for-mongo.sh
+FROM mongo-express:latest