getPrivacyPolicyChoices function change

cloud/build.gradle

@@ -34,11 +34,13 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
 
     compileOnly 'org.projectlombok:lombok'
-    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
 
     runtimeOnly 'com.h2database:h2'
+    runtimeOnly 'org.springframework.boot:spring-boot-devtools'
+
     annotationProcessor 'org.projectlombok:lombok'
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/CloudApplication.java

@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class CloudApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(CloudApplication.class, args);
     }

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/privacy/PrivacyPolicy.java

 package edu.prlab.tyler.iotgateway.cloud.pojo.privacy;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.p3p.Access;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.p3p.Collector;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.p3p.Dispute;

cloud/src/main/resources/application.properties

 server.port=8081
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+spring.h2.console.enabled=true
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.generate-ddl=true
\ No newline at end of file

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/GatewayApplication.java

@@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
 import javax.persistence.Entity;
 
 @SpringBootApplication
-@EntityScan("edu.prlab.tyler.iotgateway")
 public class GatewayApplication {
     public static void main(String[] args) {
         SpringApplication.run(GatewayApplication.class, args);

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

@@ -40,7 +40,7 @@ public class PrivacyService {
     }
 
     public Optional<PrivacyChoiceResponse> setPrivacyPolicyChoice(PrivacyChoice privacyChoice) {
-        System.out.println(privacyChoice.toString());
+        System.out.println("setPrivacyPolicyChoice : " + privacyChoice.toString());
         return Optional.of(privacyChoice)
                 .map(choice -> template.postForObject(cloudAddress + "/choice", choice, PrivacyChoice.class))
                 .flatMap(choice -> Optional.of(privacyChoiceIndexRepository.save(PrivacyChoiceIndex.builder()
@@ -62,13 +62,29 @@ public class PrivacyService {
     public Iterable<PrivacyChoiceResponse> getPrivacyPolicyChoices() {
         return () -> StreamSupport.stream(
                 template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
-                        new ParameterizedTypeReference<Iterable<PrivacyChoice>>() { }).getBody().spliterator(),
+                        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()).iterator();
+                                .build())
+                        .orElseGet(() -> new PrivacyChoiceResponse())
+                ).iterator();
     }
+
+//    private PrivacyChoiceResponse getPrivacyChoiceResponse(PrivacyChoice choice) {
+//        return privacyChoiceIndexRepository.findById(choice.getId())
+//                .map(choiceIndex -> PrivacyChoiceResponse.builder()
+//                        .id(choiceIndex.getId())
+//                        .localDateTime(choiceIndex.getLocalDateTime())
+//                        .privacyContent(choice.getPrivacyContent())
+//                        .build())
+//                .orElseGet(() -> {
+//                    System.out.println(choice.getId() + "is not found");
+//                    return new PrivacyChoiceResponse();
+//                });
+//    }
 }

gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java

@@ -123,5 +123,13 @@ public class GatewayHttpApiTest {
                 .andExpect(status().isOk())
                 .andReturn();
         Assert.assertNotNull(result);
+
+        result = mvc.perform(MockMvcRequestBuilders
+                .get("/choice")
+                .accept(MediaType.APPLICATION_JSON_UTF8))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andReturn();
+        Assert.assertNotNull(result);
     }
 }