From adcc65d40247757112e2c20adbdfcabcf055cc27 Mon Sep 17 00:00:00 2001
From: lpapadopoulos <lpapadopoulos@ubitech.eu>
Date: Tue, 28 May 2024 15:54:53 +0300
Subject: [PATCH] Fix get operation bug
---
.../gsm674/api/GeographicSiteManagementApiController.java | 4 ++--
.../gsm674/reposervices/GeographicSiteManagementService.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java b/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
index 22d27e0..3153156 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
@@ -65,14 +65,14 @@ public class GeographicSiteManagementApiController implements GeographicSiteMana
Individual ind = individualRepoService.findByUsername(principal.getName());
GeographicSite gs= geographicSiteManagementService.findGeographicSiteByRelatedPartyId(ind.getId());
- return new ResponseEntity<>(gs,HttpStatus.OK);
+ return new ResponseEntity<GeographicSite>(gs,HttpStatus.OK);
} else if ( authentication.getAuthorities().contains( new SimpleGrantedAuthority( UserRoleType.ROLE_ADMIN.getValue() ) ) ){
+ return new ResponseEntity<GeographicSite>(geographicSiteManagementService.findGeographicSiteByUUID(id), HttpStatus.OK);
}else {
return new ResponseEntity< GeographicSite >(HttpStatus.FORBIDDEN );
}
- return new ResponseEntity<>(geographicSiteManagementService.findGeographicSiteByUUID(id), HttpStatus.OK);
} catch (Exception e) {
log.error(COULD_NOT_SERIALIZE, e);
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java b/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
index a13b70d..607e1ca 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
@@ -39,6 +39,11 @@ public class GeographicSiteManagementService {
public GeographicSite findGeographicSiteByRelatedPartyId(String uuid){
Optional<GeographicSite> gs=geographicSiteManagementRepository.findByRelatedPartyId(uuid);
+ try {
+ log.info("Found geographic site from related party:{} , geographic site info: {}", uuid, gs.orElse(null).toString());
+ }catch(Exception e){
+ log.error("Error during fetch of geographic site info: {}", e.getMessage());
+ }
return gs.orElse(null);
}
--
GitLab