From 7bc93b5171cca8598bb9fdfc18636f434904913c Mon Sep 17 00:00:00 2001
From: manimaarans <manimaaran@beehyv.com>
Date: Wed, 8 Nov 2023 13:32:14 +0530
Subject: [PATCH 1/3] BS-288| Mani | added property to include  error message
 on the responses

---
 src/main/resources/application.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index eed5a4b..d10524c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -34,3 +34,6 @@ card-summary-template-content=The amount of %s prescribed is %s times the averag
 
 # who atc url template
 who.atc.url-template=https://www.whocc.no/atc_ddd_index/?code={0}
+
+# property to include error message as part of the response
+server.error.include-message=always

From fff671122876806f2dbcf2a0369faac31db88f63 Mon Sep 17 00:00:00 2001
From: manimaarans <manimaaran@beehyv.com>
Date: Wed, 8 Nov 2023 14:15:51 +0530
Subject: [PATCH 2/3] BS-288| Mani | updated the error message thrown

---
 .../dose/SnomedMedicationDefinedDailyDoseService.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java b/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
index 0461cfb..ddae798 100644
--- a/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
+++ b/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
@@ -287,13 +287,13 @@ private void aggregateMedicationsBySubstance(Map<String, AggregatedMedicationsBy
             try {
                 prescribedDailyDoseInUnitOfSubstanceStrength = getPrescribedDailyDoseInUnitOfSubstanceStrength(prescribedDailyDose, strengthValue, strengthUnit, denominatorValue, denominatorUnit);
             } catch (Exception e) {
-                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Strength units for the medicine %s", snomedMedicationLabel), null);
+                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Dose units for the medicine %s", snomedMedicationLabel), null);
             }
             PrescribedDailyDose prescribedDailyDoseInUnitOfDDD;
             try {
                 prescribedDailyDoseInUnitOfDDD = getPrescribedDailyDoseInUnitOfDDD(prescribedDailyDoseInUnitOfSubstanceStrength.getQuantity(), prescribedDailyDoseInUnitOfSubstanceStrength.getUnit(), substanceDefinedDailyDose.unit());
             } catch (Exception e) {
-                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Dose  units for the medicine %s", snomedMedicationLabel), null);
+                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Dose units for the medicine %s", snomedMedicationLabel), null);
             }
             AggregatedMedicationsBySubstance aggregatedMedicationsBySubstance = aggregatedMedicationsBySubstanceMap.get(substance);
             if (aggregatedMedicationsBySubstance == null) {

From 1d1255316843aa78223173aa6973328de4ad8772 Mon Sep 17 00:00:00 2001
From: manimaarans <manimaaran@beehyv.com>
Date: Wed, 8 Nov 2023 16:29:43 +0530
Subject: [PATCH 3/3] BS-288 | Mani | Updated the error message based on desk
 check comments

---
 .../dose/SnomedMedicationDefinedDailyDoseService.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java b/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
index ddae798..e40973d 100644
--- a/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
+++ b/src/main/java/org/snomed/cdsservice/service/medication/dose/SnomedMedicationDefinedDailyDoseService.java
@@ -287,13 +287,13 @@ private void aggregateMedicationsBySubstance(Map<String, AggregatedMedicationsBy
             try {
                 prescribedDailyDoseInUnitOfSubstanceStrength = getPrescribedDailyDoseInUnitOfSubstanceStrength(prescribedDailyDose, strengthValue, strengthUnit, denominatorValue, denominatorUnit);
             } catch (Exception e) {
-                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Dose units for the medicine %s", snomedMedicationLabel), null);
+                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Prescribed dosage could not be validated for %s. Reason: Invalid dose unit.", snomedMedicationLabel), null);
             }
             PrescribedDailyDose prescribedDailyDoseInUnitOfDDD;
             try {
                 prescribedDailyDoseInUnitOfDDD = getPrescribedDailyDoseInUnitOfDDD(prescribedDailyDoseInUnitOfSubstanceStrength.getQuantity(), prescribedDailyDoseInUnitOfSubstanceStrength.getUnit(), substanceDefinedDailyDose.unit());
             } catch (Exception e) {
-                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Mismatched Dose units for the medicine %s", snomedMedicationLabel), null);
+                throw new ResponseStatusException(HttpStatus.PRECONDITION_FAILED, String.format("Prescribed dosage could not be validated for %s. Reason: Invalid dose unit.", snomedMedicationLabel), null);
             }
             AggregatedMedicationsBySubstance aggregatedMedicationsBySubstance = aggregatedMedicationsBySubstanceMap.get(substance);
             if (aggregatedMedicationsBySubstance == null) {