From 0d5433e22f14c57f7266ee4f0816547c5b331fc4 Mon Sep 17 00:00:00 2001
From: lpapadopoulos <lpapadopoulos@ubitech.eu>
Date: Wed, 29 May 2024 15:14:58 +0300
Subject: [PATCH] fix geographic site info object with null values
---
.../api/GeographicSiteManagementApiController.java | 11 +++++++++++
1 file changed, 11 insertions(+)
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 88fcdbc..ea1b983 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
@@ -3,7 +3,10 @@ package org.etsi.osl.tmf.gsm674.api;
import io.swagger.v3.oas.annotations.Parameter;
import jakarta.validation.Valid;
import org.etsi.osl.model.nfv.UserRoleType;
+import org.etsi.osl.tmf.gsm674.model.GeographicAddressValue;
import org.etsi.osl.tmf.gsm674.model.GeographicSite;
+import org.etsi.osl.tmf.gsm674.model.GeographicSubAddressValue;
+import org.etsi.osl.tmf.gsm674.model.PlaceRefOrValue;
import org.etsi.osl.tmf.gsm674.reposervices.GeographicSiteManagementService;
import org.etsi.osl.tmf.pm632.model.Individual;
import org.etsi.osl.tmf.pm632.reposervices.IndividualRepoService;
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.List;
@Controller
@@ -66,6 +70,13 @@ public class GeographicSiteManagementApiController implements GeographicSiteMana
GeographicSite gs= geographicSiteManagementService.findGeographicSiteByRelatedPartyId(ind.getId());
if (gs==null) gs =new GeographicSite();
+ GeographicSubAddressValue geographicSubAddressValue=new GeographicSubAddressValue();
+ GeographicAddressValue geographicAddressValue=new GeographicAddressValue();
+ geographicAddressValue.setGeographicSubAddress(geographicSubAddressValue);
+ PlaceRefOrValue placeRefOrValue=new PlaceRefOrValue(geographicAddressValue);
+ List<PlaceRefOrValue> placeRefOrValues=new ArrayList<>();
+ placeRefOrValues.add(placeRefOrValue);
+ gs.setPlace(placeRefOrValues);
return new ResponseEntity<GeographicSite>(gs,HttpStatus.OK);
} else if ( authentication.getAuthorities().contains( new SimpleGrantedAuthority( UserRoleType.ROLE_ADMIN.getValue() ) ) ){
--
GitLab