FDP-1629: ignoring case when getting firmware

Signed-off-by: Loes Immens <loes.immens@alliander.com>

Author: loesimmens

osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java

@@ -210,7 +210,7 @@ public void addManufacturer(
     this.domainHelperService.isAllowed(organisation, PlatformFunction.CREATE_MANUFACTURER);
 
     final Manufacturer databaseManufacturer =
-        this.manufacturerRepository.findByCode(manufacturer.getCode());
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer.getCode());
 
     if (databaseManufacturer != null) {
       LOGGER.info("Manufacturer already exists.");
@@ -237,7 +237,7 @@ public void changeManufacturer(
     this.domainHelperService.isAllowed(organisation, PlatformFunction.CHANGE_MANUFACTURER);
 
     final Manufacturer databaseManufacturer =
-        this.manufacturerRepository.findByCode(manufacturer.getCode());
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer.getCode());
 
     if (databaseManufacturer == null) {
       LOGGER.info("Manufacturer not found.");
@@ -268,7 +268,7 @@ public void removeManufacturer(
     this.domainHelperService.isAllowed(organisation, PlatformFunction.REMOVE_MANUFACTURER);
 
     final Manufacturer databaseManufacturer =
-        this.manufacturerRepository.findByCode(manufacturerCode);
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturerCode);
     final List<DeviceModel> deviceModels =
         this.deviceModelRepository.findByManufacturer(databaseManufacturer);
 
@@ -377,7 +377,8 @@ public void addDeviceModel(
     final Manufacturer manufacturer = this.findManufacturerByCode(manufacturerCode);
 
     final DeviceModel savedDeviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(manufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            manufacturer, modelCode);
 
     if (savedDeviceModel != null) {
       LOGGER.info("DeviceModel already exists.");
@@ -406,9 +407,11 @@ public void removeDeviceModel(
         this.domainHelperService.findOrganisation(organisationIdentification);
     this.domainHelperService.isAllowed(organisation, PlatformFunction.REMOVE_DEVICE_MODEL);
 
-    final Manufacturer databaseManufacturer = this.manufacturerRepository.findByCode(manufacturer);
+    final Manufacturer databaseManufacturer =
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer);
     final DeviceModel removedDeviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(databaseManufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            databaseManufacturer, modelCode);
 
     if (removedDeviceModel == null) {
       LOGGER.info("DeviceModel not found.");
@@ -453,9 +456,11 @@ public void changeDeviceModel(
         this.domainHelperService.findOrganisation(organisationIdentification);
     this.domainHelperService.isAllowed(organisation, PlatformFunction.CHANGE_DEVICE_MODEL);
 
-    final Manufacturer databaseManufacturer = this.manufacturerRepository.findByCode(manufacturer);
+    final Manufacturer databaseManufacturer =
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer);
     final DeviceModel changedDeviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(databaseManufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            databaseManufacturer, modelCode);
 
     if (changedDeviceModel == null) {
       LOGGER.info("DeviceModel not found.");
@@ -505,9 +510,11 @@ private List<FirmwareFile> getFirmwareFiles(
       return new ArrayList<>();
     }
 
-    final Manufacturer manufacturer = this.manufacturerRepository.findByCode(manufacturerCode);
+    final Manufacturer manufacturer =
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturerCode);
     final DeviceModel deviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(manufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            manufacturer, modelCode);
 
     if (deviceModel == null) {
       return new ArrayList<>();
@@ -588,7 +595,8 @@ public void addFirmware(
     final Manufacturer databaseManufacturer = this.findManufacturerByCode(manufacturer);
 
     final DeviceModel databaseDeviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(databaseManufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            databaseManufacturer, modelCode);
 
     if (databaseDeviceModel == null) {
       LOGGER.info("DeviceModel doesn't exist.");
@@ -654,7 +662,8 @@ public void addFirmware(
 
   private Manufacturer findManufacturerByCode(final String manufacturer)
       throws FunctionalException {
-    final Manufacturer databaseManufacturer = this.manufacturerRepository.findByCode(manufacturer);
+    final Manufacturer databaseManufacturer =
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer);
 
     if (databaseManufacturer == null) {
       LOGGER.info("Manufacturer doesn't exist.");
@@ -694,7 +703,7 @@ public void addOrChangeFirmware(
           this.findManufacturerByCode(deviceModel.getManufacturer());
 
       final DeviceModel databaseDeviceModel =
-          this.deviceModelRepository.findByManufacturerAndModelCode(
+          this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
               databaseManufacturer, deviceModel.getModelCode());
 
       if (databaseDeviceModel == null) {
@@ -812,7 +821,8 @@ public void changeFirmware(
             .orElseThrow(
                 supplyFirmwareFileNotFoundException(id, firmwareFileRequest.getFileName()));
 
-    final Manufacturer databaseManufacturer = this.manufacturerRepository.findByCode(manufacturer);
+    final Manufacturer databaseManufacturer =
+        this.manufacturerRepository.findByCodeIgnoreCase(manufacturer);
 
     if (databaseManufacturer == null) {
       LOGGER.info("Manufacturer {} doesn't exist.", manufacturer);
@@ -823,7 +833,8 @@ public void changeFirmware(
     }
 
     final DeviceModel databaseDeviceModel =
-        this.deviceModelRepository.findByManufacturerAndModelCode(databaseManufacturer, modelCode);
+        this.deviceModelRepository.findByManufacturerAndModelCodeIgnoreCase(
+            databaseManufacturer, modelCode);
 
     if (databaseDeviceModel == null) {
       LOGGER.info(

osgp/platform/osgp-adapter-ws-shared-db/src/main/java/org/opensmartgridplatform/adapter/ws/shared/db/domain/repositories/writable/WritableDeviceModelRepository.java

@@ -12,7 +12,7 @@
 
 @Repository
 public interface WritableDeviceModelRepository extends JpaRepository<DeviceModel, Long> {
-  DeviceModel findByManufacturerAndModelCode(Manufacturer manufacturer, String modelCode);
+  DeviceModel findByManufacturerAndModelCodeIgnoreCase(Manufacturer manufacturer, String modelCode);
 
   DeviceModel findByManufacturerCodeAndModelCode(String string, String modelCode);
 

osgp/platform/osgp-adapter-ws-shared-db/src/main/java/org/opensmartgridplatform/adapter/ws/shared/db/domain/repositories/writable/WritableManufacturerRepository.java

@@ -10,7 +10,7 @@
 
 @Repository
 public interface WritableManufacturerRepository extends JpaRepository<Manufacturer, Long> {
-  Manufacturer findByCode(String code);
+  Manufacturer findByCodeIgnoreCase(String code);
 
   Manufacturer findByName(String manufacturerName);
 }