PrivacyChoice api

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java

@@ -42,15 +42,15 @@ public class PrivacyService {
     public Optional<PrivacyChoiceResponse> setPrivacyPolicyChoice(PrivacyChoice privacyChoice) {
         return Optional.of(privacyChoice)
                 .map(choice -> template.postForObject(cloudAddress + "/choice", choice, PrivacyChoice.class))
-                .map(choice -> privacyChoiceIndexRepository.save(PrivacyChoiceIndex.builder()
+                .flatMap(choice -> Optional.ofNullable(privacyChoiceIndexRepository.save(PrivacyChoiceIndex.builder()
                         .id(choice.getId())
                         .localDateTime(LocalDateTime.now())
                         .build()))
-                .map(choice -> PrivacyChoiceResponse.builder()
-                        .id(choice.getId())
-                        .localDateTime(LocalDateTime.now())
-                        .privacyContent(privacyChoice.getPrivacyContent())
-                        .build());
+                        .map(choiceIndex -> PrivacyChoiceResponse.builder()
+                                .id(choice.getId())
+                                .localDateTime(LocalDateTime.now())
+                                .privacyContent(choice.getPrivacyContent())
+                                .build()));
     }
 
 //    public Optional<Iterable<PrivacyChoice>> getPrivacyPolicyChoices() {
@@ -63,14 +63,11 @@ public class PrivacyService {
                 new ParameterizedTypeReference<Iterable<PrivacyChoice>>() {
                 }).getBody().spliterator(), false)
                 .map(choice -> privacyChoiceIndexRepository.findById(choice.getId())
-                                .map(choiceIndex -> PrivacyChoiceResponse.builder()
-                                    .id(choiceIndex.getId())
-                                    .localDateTime(choiceIndex.getLocalDateTime())
-                                    .privacyContent(choice.getPrivacyContent())
-                                    .build()).get())
+                        .map(choiceIndex -> PrivacyChoiceResponse.builder()
+                                .id(choiceIndex.getId())
+                                .localDateTime(choiceIndex.getLocalDateTime())
+                                .privacyContent(choice.getPrivacyContent())
+                                .build()).get())
                 .iterator();
-
     }
-
-
 }