Skip to content
Snippets Groups Projects
Commit 0d5433e2 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

fix geographic site info object with null values

parent f6987a4b
No related branches found
No related tags found
1 merge request!25Tmf 674 feature
Pipeline #6261 passed
......@@ -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() ) ) ){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment