refactor(dto): simplify data transfer logic for diabetes risk predict…

…ion request

- refactor data transfer logic by:
  - removing DiabetesRiskModel as it's no longer needed
  - replacing with more focused PatientRiskRequest DTO
- rename PatientRiskInfo to PatientRiskRequest:
  - improve naming clarity for request/response pattern
  - ensure consistency across Frontend and Backend services
  - follow REST API conventions

Notes are now fetched directly by backend from elasticsearch, eliminating the need to transfer them through Frontend. Indeed only Id, DateOfBirth and Gender are needed. Id is needed to fetch notes, and Gender and DateOfBirth are needed to calculate diabetes risk.

BackendDiabetesRiskPrediction/Controllers/DiabetesRiskPredictionsController.cs

@@ -12,11 +12,11 @@ public class BackendDiabetesRiskPredictionsController(DiabetesRiskNotePrediction
 
 
     [HttpGet]
-    public async Task<ActionResult<DiabetesRisk>> GetDiabetesRisk([FromBody] DiabetesRiskRequest diabetesRiskRequest)
+    public async Task<ActionResult<DiabetesRisk>> GetDiabetesRisk([FromBody] PatientRiskRequest patientRiskRequest)
     {
         logger.LogDebug("GetDiabetesRisk called");
-        logger.LogDebug($"Diabetes risk request : {diabetesRiskRequest}");
-        DiabetesRiskPrediction diabetesRisk = await diabetesRiskNotePredictionService.DiabetesRiskPrediction(diabetesRiskRequest.NotesRiskInfo, diabetesRiskRequest.PatientRiskInfo);
+        logger.LogDebug($"Diabetes risk request : {patientRiskRequest}");
+        DiabetesRiskPrediction diabetesRisk = await diabetesRiskNotePredictionService.DiabetesRiskPrediction(patientRiskRequest);
         logger.LogInformation($"Diabetes risk is : {diabetesRisk.DiabetesRisk}");
         return Ok(diabetesRisk);
     }

BackendDiabetesRiskPrediction/Models/PatientRiskInfo.cs → BackendDiabetesRiskPrediction/Models/PatientRiskRequest.cs

@@ -1,6 +1,6 @@
 namespace BackendDiabetesRiskPrediction.Models;
 
-public class PatientRiskInfo
+public class PatientRiskRequest
 {
     public int Id { get; set; }
     public required DateOnly DateOfBirth { get; set; }

BackendDiabetesRiskPrediction/Services/DiabetesRiskNotePredictionService.cs

@@ -19,10 +19,10 @@ public class DiabetesRiskNotePredictionService(ElasticsearchService elasticsearc
         "Anticorps"
     ];
 
-    public async Task<DiabetesRiskPrediction> DiabetesRiskPrediction(List<NoteRiskInfo>? notes, PatientRiskInfo? patientRiskInfo)
+    public async Task<DiabetesRiskPrediction> DiabetesRiskPrediction(PatientRiskRequest? patientRiskInfo)
     {
         DiabetesRiskPrediction diabetesRiskPrediction = new();
-        if (notes is null || patientRiskInfo is null)
+        if (patientRiskInfo is null)
         {
             diabetesRiskPrediction.DiabetesRisk = DiabetesRisk.None;
             return diabetesRiskPrediction;
@@ -38,9 +38,9 @@ public async Task<DiabetesRiskPrediction> DiabetesRiskPrediction(List<NoteRiskIn
 
     private async Task<int> DiabetesRiskPredictionNotesAnalysis(int patientId, HashSet<string> hashSetofTriggerWords) => await elasticsearchService.CountUniqueWordsInNotes(patientId, hashSetofTriggerWords);
 
-    private DiabetesRisk DiabetesRiskPredictionCalculator(PatientRiskInfo patientRiskInfo, int triggersDiabetesRiskFromNotes)
+    private DiabetesRisk DiabetesRiskPredictionCalculator(PatientRiskRequest patientRiskRequest, int triggersDiabetesRiskFromNotes)
     {
-        int age = PatientAgeCalculator(patientRiskInfo);
+        int age = PatientAgeCalculator(patientRiskRequest);
 
         // Do not need to consider if Female or Male or Age
         if (triggersDiabetesRiskFromNotes == 0)
@@ -50,17 +50,17 @@ private DiabetesRisk DiabetesRiskPredictionCalculator(PatientRiskInfo patientRis
 
         // Patient is younger than 30 (exclusive)
         return age < 30
-            ? DiabetesRiskPredictionForUnder30(patientRiskInfo, triggersDiabetesRiskFromNotes)
+            ? DiabetesRiskPredictionForUnder30(patientRiskRequest, triggersDiabetesRiskFromNotes)
             :
             // Patient is older (or equal) than 30 (inclusive)
             DiabetesRiskPredictionFor30AndOlder(triggersDiabetesRiskFromNotes);
     }
 
-    private DiabetesRisk DiabetesRiskPredictionForUnder30(PatientRiskInfo patientRiskInfo, int triggersDiabetesRiskFromNotes)
+    private DiabetesRisk DiabetesRiskPredictionForUnder30(PatientRiskRequest patientRiskRequest, int triggersDiabetesRiskFromNotes)
     {
-        logger.LogInformation($"Patient gender is : {patientRiskInfo.Gender}");
+        logger.LogInformation($"Patient gender is : {patientRiskRequest.Gender}");
 
-        return patientRiskInfo.Gender switch
+        return patientRiskRequest.Gender switch
         {
             // Patient is a male
             // Let's consider triggers from notes
@@ -89,10 +89,10 @@ private static DiabetesRisk DiabetesRiskPredictionFor30AndOlder(int triggersDiab
 
     }
 
-    private int PatientAgeCalculator(PatientRiskInfo patientRiskInfo)
+    private int PatientAgeCalculator(PatientRiskRequest patientRiskRequest)
     {
         DateTime currentDate = DateTime.Now;
-        DateOnly birthDate = patientRiskInfo.DateOfBirth;
+        DateOnly birthDate = patientRiskRequest.DateOfBirth;
         int age = currentDate.Year - birthDate.Year;
         logger.LogInformation("Patient age is : {Age}", age);
         return age;

Frontend/Controllers/PatientsController.cs

@@ -63,17 +63,15 @@ public async Task<IActionResult> Details(int id)
 
             // First let's construct our needs
             PatientViewModel patientViewModel = PatientService.MapPatientNoteToPatientNotesViewModel(patient, notes);
-            DiabetesRiskRequestModel diabetesRiskRequestModel = DiabetesRiskPredictionService.MapPatientViewModelAndNoteToDiabetesRiskRequestModel(patientViewModel);
+            PatientRiskRequest patientRiskRequest = DiabetesRiskPredictionService.MapPatientViewModelToPatientRiskInfo(patientViewModel);
 
             // Secondly let's ask DiabetesRiskPredictionService
             HttpRequestMessage requestForDiabetesRiskPredictionService = new(HttpMethod.Get, $"{_diabetesRiskPredictionServiceUrl}/")
             {
-                Content = JsonContent.Create(diabetesRiskRequestModel)
+                Content = JsonContent.Create(patientRiskRequest)
             };
-
-            _logger.LogInformation("Requesting Diabetes Risk Prediction for patient with id {PatientId}", id);
-            _logger.LogInformation("Request body: {RequestBody}", diabetesRiskRequestModel);
-
+            _logger.LogInformation("Requesting Diabetes Risk Prediction for patient with id {PatientId}, Date of birth: {DateOfBirth}, Gender: {Gender}", patientRiskRequest.Id.ToString(), patientRiskRequest.DateOfBirth.ToString(), patientRiskRequest.Gender);
+
             // Finally let's manage the answer for DiabetesRiskPredictionService
             HttpResponseMessage responseFromDiabetesRiskService = await _httpClientService.SendAsync(requestForDiabetesRiskPredictionService);
 

Frontend/Models/PatientRiskInfo.cs → Frontend/Models/PatientRiskRequest.cs

@@ -1,6 +1,6 @@
 namespace Frontend.Models;
 
-public class PatientRiskInfo
+public class PatientRiskRequest
 {
     public int Id { get; set; }
     public required DateOnly DateOfBirth { get; set; }

Frontend/Services/DiabetesRiskPredictionService.cs

@@ -3,38 +3,10 @@ namespace Frontend.Services;
 
 public static class DiabetesRiskPredictionService
 {
-    private static NoteRiskInfo MapPatientViewModelToNoteRiskInfo(Note note) => new()
-    {
-        Id = note.Id,
-        PatientId = note.PatientId,
-        Title = note.Title,
-        Body = note.Body
-    };
-
-    private static PatientRiskInfo MapPatientViewModelToPatientRiskInfo(PatientViewModel patientViewModel) => new()
+    public static PatientRiskRequest MapPatientViewModelToPatientRiskInfo(PatientViewModel patientViewModel) => new()
     {
         Id = patientViewModel.PatientId,
         DateOfBirth = patientViewModel.DateOfBirth,
         Gender = patientViewModel.Gender
     };
-
-    public static DiabetesRiskRequestModel MapPatientViewModelAndNoteToDiabetesRiskRequestModel(PatientViewModel patientViewModel)
-    {
-        PatientRiskInfo patientRiskInfo = MapPatientViewModelToPatientRiskInfo(patientViewModel);
-        if (patientViewModel.Notes == null)
-        {
-            return new DiabetesRiskRequestModel
-            {
-                PatientRiskInfo = patientRiskInfo
-            };
-        }
-        List<NoteRiskInfo> noteRiskInfos = patientViewModel.Notes
-                                                           .Select(MapPatientViewModelToNoteRiskInfo)
-                                                           .ToList();
-        return new DiabetesRiskRequestModel
-        {
-            NotesRiskInfo = noteRiskInfos,
-            PatientRiskInfo = patientRiskInfo
-        };
-    }
 }