getPrivacyPolicyReportResponse

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DeviceController.java

@@ -56,9 +56,9 @@ public class DeviceController {
     }
 
     //透過UDN讀取PrivacyPolicyReport
-    @GetMapping("/privacy/{UDN}")
-    public ResponseEntity<PrivacyPolicyReport> readPrivacyPolicyReportByDevice(@PathVariable(value = "UDN") String UDN) {
-        return privacyPolicyReportService.readByDevice(UDN)
+    @GetMapping("/privacy/{udn}")
+    public ResponseEntity<PrivacyPolicyReport> readPrivacyPolicyReportByDevice(@PathVariable(value = "udn") String udn) {
+        return privacyPolicyReportService.readByDevice(udn)
                 .map(ResponseEntity::ok)
                 .orElseGet(()->ResponseEntity.noContent().build());
     }

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/GatewayController.java

 package edu.prlab.tyler.iotgateway.cloud.controllers;
 
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyContent;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicy;
 import edu.prlab.tyler.iotgateway.cloud.services.PrivacyChoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

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

@@ -20,7 +20,6 @@ public class PrivacyContent {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @JsonIgnore
     private long id;
 
     @OneToOne(cascade = CascadeType.ALL)

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/repositories/PrivacyChoiceRepository.java

 package edu.prlab.tyler.iotgateway.cloud.repositories;
 
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
-import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyContent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
-
 @Repository
 public interface PrivacyChoiceRepository extends CrudRepository<PrivacyChoice, Long> {
-    Optional<Iterable<PrivacyChoice>> findPrivacyChoicesByPrivacyContent(PrivacyContent privacyContent);
 }

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/PrivacyChoiceService.java

 package edu.prlab.tyler.iotgateway.cloud.services;
 
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicy;
+import edu.prlab.tyler.iotgateway.cloud.repositories.PrivacyChoiceRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Service;
@@ -9,16 +11,19 @@ import java.util.Optional;
 import java.util.stream.StreamSupport;
 
 @Service
-public class PrivacyChoiceService extends CrudService<PrivacyChoice, Long>{
+public class PrivacyChoiceService extends CrudService<PrivacyChoice, Long> {
+    private PrivacyChoiceRepository privacyChoiceRepository;
+
     @Autowired
-    public PrivacyChoiceService(CrudRepository<PrivacyChoice, Long> repository) {
+    public PrivacyChoiceService(CrudRepository<PrivacyChoice, Long> repository,
+                                PrivacyChoiceRepository privacyChoiceRepository) {
         super(repository);
+        this.privacyChoiceRepository = privacyChoiceRepository;
     }
 
     public Iterable<PrivacyChoice> readPrivacyChoiceByDevice(String udn) {
-        return ()-> StreamSupport.stream(readll().spliterator(),false)
-                    .filter(choice->choice.getPrivacyContent().getDevice().getUdn().equals(udn))
+        return () -> StreamSupport.stream(readll().spliterator(), false)
+                .filter(choice -> choice.getPrivacyContent().getDevice().getUdn().equals(udn))
                 .iterator();
     }
-
 }

cloud/src/test/java/edu/prlab/tyler/iotgateway/cloud/CloudHttpApiTest.java

@@ -220,5 +220,6 @@ public class CloudHttpApiTest {
                 new TypeReference<Iterable<PrivacyChoice>>(){});
 
         Assert.assertNotNull(privacyChoices);
+
     }
 }

contract/src/test/java/edu/prlab/tyler/iotgateway/contract/ContractTester.java

@@ -71,27 +71,6 @@ public class ContractTester {
         String privacyPolicy = deviceContract.privacypolicy().send();
         Assert.assertNotNull(privacyPolicy);
         System.out.println(privacyPolicy);
-
-        //TODO CANNOT BIND
-        //Gateway
-//        GatewayContract gatewayContract = GatewayContract.deploy(quorum, manager, DEFAULT_GAS_PROVIDER).send();
-//        Assert.assertNotNull(gatewayContract);
-//        gateWayContractAddress = gatewayContract.getContractAddress();
-//        System.out.println("gatewayContract Address：" + gateWayContractAddress);
-//
-//        receipt = deviceContract.setBuyer(gatewayContract.getContractAddress()).send();
-//        Assert.assertNotNull(receipt);
-//
-//        Quorum quorum1 = Quorum.build(new HttpService(rpcUrl));
-//        String userAddress1 = quorum1.ethAccounts().send().getAccounts().get(quorum1.ethAccounts().send().getAccounts().size() - 1);
-//        ClientTransactionManager manager1 = new ClientTransactionManager(quorum1, userAddress1);
-//
-//        System.out.println("deviceContractAddress" + deviceContractAddress);
-//        DeviceContract deviceContract1 = DeviceContract.load(deviceContractAddress, quorum1, manager1, DEFAULT_GAS_PROVIDER);
-
-//        System.out.println("deviceContractAddress" + gateWayContractAddress);
-//        receipt = deviceContract1.bindReq(gateWayContractAddress).send();
-//        Assert.assertNotNull(receipt);
 //
 //        String bindedString = deviceContract1.getBondDevice().send();
 //        Assert.assertNotNull(bindedString);
@@ -120,9 +99,20 @@ public class ContractTester {
         Assert.assertNotNull(receipt);
         System.out.println(receipt);
 
+        //綁定裝置
+        System.out.println("綁定裝置");
         receipt = gatewayContract.bindRequest(deviceContractAddress).send();
         Assert.assertNotNull(receipt);
         System.out.println(receipt);
 
+        //取得綁定裝置個數
+        BigInteger deviceNum = gatewayContract.numDevices().send();
+        Assert.assertNotNull(deviceNum);
+        System.out.println(deviceNum);
+
+        //取得第i個裝置的Address
+        String deviceAddress = gatewayContract.getDeviceAddress(BigInteger.ONE).send();
+        Assert.assertNotNull(deviceAddress);
+        System.out.println(deviceAddress);
     }
 }

gateway/build.gradle

@@ -2,6 +2,7 @@ buildscript {
     ext {
         springBootVersion = '2.1.4.RELEASE'
         mapstructVersion = '1.3.0.Final'
+        guavaVersion = '27.1-jre'
     }
     repositories {
         mavenCentral()
@@ -34,6 +35,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+    implementation "com.google.guava:guava:${guavaVersion}"
     implementation project(":cloud")
 
     compileOnly 'org.projectlombok:lombok'

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java

@@ -4,12 +4,15 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
 import edu.prlab.tyler.iotgateway.gateway.model.PrivacyChoiceResponse;
+import edu.prlab.tyler.iotgateway.gateway.model.PrivacyPolicyReportResponse;
 import edu.prlab.tyler.iotgateway.gateway.services.DeviceService;
 import edu.prlab.tyler.iotgateway.gateway.services.PrivacyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Optional;
+
 @RestController
 public class GatewayController {
 
@@ -44,10 +47,11 @@ public class GatewayController {
                 .orElseGet(() -> ResponseEntity.noContent().build());
     }
 
+
     //透過裝置UDN取得裝置資訊與隱私政策
-    @GetMapping("/privacy/{udn}")
-    public ResponseEntity<PrivacyPolicyReport> readPrivacyPolicyReportByDevice(@PathVariable(value = "udn") String udn) {
-        return privacyService.getRelatedPrivacyPolicies(udn)
+    @GetMapping("/privacy/{udn}/{account}")
+    public ResponseEntity<PrivacyPolicyReportResponse> readPrivacyPolicyReportByDevice(@PathVariable String udn, @PathVariable String account) {
+        return privacyService.getRelatedPrivacyPolicyByUdn(udn, account)
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.noContent().build());
     }
@@ -64,8 +68,9 @@ public class GatewayController {
     //根據使用者取得在此gateway上該使用者的隱私選擇列表
     @GetMapping("/choice/{account}")
     public ResponseEntity<Iterable<PrivacyChoiceResponse>> readPrivacyChoiceRecordsByUser(@PathVariable String account) {
-        return privacyService.getPrivacyPolicyChoicesByAccount(account)
+        return Optional.of(privacyService.getPrivacyPolicyChoicesByAccount(account))
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.noContent().build());
     }
+
 }

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/model/PrivacyPolicyReportResponse.java

+package edu.prlab.tyler.iotgateway.gateway.model;
+
+import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
+import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicy;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@NoArgsConstructor
+public class PrivacyPolicyReportResponse extends PrivacyPolicyReport {
+
+    private HashMap<Integer, Boolean> choices ;
+
+    @Builder(builderMethodName = "responseBuilder")
+    public PrivacyPolicyReportResponse(String id, String version, String description, Device device, List<PrivacyPolicy> policies, Document document, HashMap<Integer, Boolean> choices) {
+        super(id, version, description, device, policies, document);
+        this.choices = choices;
+    }
+}

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

 package edu.prlab.tyler.iotgateway.gateway.services;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Streams;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
-import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
+import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicy;
 import edu.prlab.tyler.iotgateway.gateway.model.PrivacyChoiceResponse;
+import edu.prlab.tyler.iotgateway.gateway.model.PrivacyPolicyReportResponse;
 import edu.prlab.tyler.iotgateway.gateway.pojo.PrivacyChoiceIndex;
 import edu.prlab.tyler.iotgateway.gateway.repositories.PrivacyChoiceIndexRepository;
 import edu.prlab.tyler.iotgateway.gateway.repositories.UserRepository;
@@ -10,8 +15,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 @Service
@@ -28,34 +37,68 @@ public class PrivacyService {
         this.remoteService = remoteService;
     }
 
-    public Optional<PrivacyPolicyReport> getRelatedPrivacyPolicies(String udn) {
-        return remoteService.readRelatedPrivacyPolicies(udn);
+    // TODO 如果此User有表達過則回傳表達隱私政策與其表達，
+    public Optional<PrivacyPolicyReportResponse> getRelatedPrivacyPolicyByUdn(String udn, String account) {
+        return remoteService.readRelatedPrivacyPolicyReport(udn)
+                .flatMap(report -> Optional.ofNullable(this.findChoicesByPolicies(report.getPolicies(), udn, account))
+                        .map(this::choicesToMap)
+                        .map(choices -> PrivacyPolicyReportResponse.responseBuilder()
+                                .id(report.getId())
+                                .version(report.getVersion())
+                                .description(report.getDescription())
+                                .device(report.getDevice())
+                                .policies(report.getPolicies())
+                                .choices(choices)
+                                .build()));
+    }
+
+    private List<Boolean> findChoicesByPolicies(List<PrivacyPolicy> privacyPolicies, String udn, String account) {
+        return privacyPolicies.stream()
+                .map(policy -> this.findPrivacyChoiceByPrivacyPolicy(policy, udn, account))
+                .map(choices -> (Iterables.isEmpty(choices)) ? Boolean.valueOf(false) : Iterables.getLast(choices).isAccepted())
+                .collect(Collectors.toList());
+    }
+
+    private HashMap<Integer, Boolean> choicesToMap(List<Boolean> choices) {
+        return Streams.mapWithIndex(choices.stream(),
+                (choice, index) -> Maps.newHashMap(ImmutableMap.of(Long.valueOf(index).intValue(), choice)))
+                .collect(HashMap::new, HashMap::putAll, HashMap::putAll);
+    }
+
+    private Iterable<PrivacyChoice> findPrivacyChoiceByPrivacyPolicy(PrivacyPolicy privacyPolicy, String udn, String account) {
+        return () -> StreamSupport.stream(remoteService.readPrivacyChoices().spliterator(), false)
+                .filter(choice -> choice.getPrivacyContent().getPolicy().getId().equals(privacyPolicy.getId()) &
+                        choice.getPrivacyContent().getUser().getAccount().equals(account) &
+                        choice.getPrivacyContent().getDevice().getUdn().equals(udn))
+                .collect(Collectors.toList()).iterator();
     }
 
     public Optional<PrivacyChoiceResponse> setPrivacyChoice(PrivacyChoice privacyChoice) {
-        System.out.println("setPrivacyPolicyChoice : " + privacyChoice.toString());
         return Optional.of(privacyChoice)
                 .flatMap(choice -> remoteService.setPrivacyChoice(choice))
-                .flatMap(choice -> Optional.of(privacyChoiceIndexRepository.save(PrivacyChoiceIndex.builder()
+                .flatMap(choice -> this.addPrivacyChoiceIndex(PrivacyChoiceIndex.builder()
                         .id(choice.getId())
                         .localDateTime(LocalDateTime.now())
-                        .build()))
+                        .build())
                         .map(choiceIndex -> PrivacyChoiceResponse.builder()
                                 .id(choice.getId())
-                                .localDateTime(LocalDateTime.now())
+                                .localDateTime(choiceIndex.getLocalDateTime())
                                 .privacyChoice(choice)
                                 .build()));
     }
 
+    private Optional<PrivacyChoiceIndex> addPrivacyChoiceIndex(PrivacyChoiceIndex choiceIndex) {
+        return Optional.ofNullable(privacyChoiceIndexRepository.save(choiceIndex));
+    }
+
 //    public Optional<Iterable<PrivacyChoice>> getPrivacyPolicyChoices() {
 //        return Optional.ofNullable(template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
 //                new ParameterizedTypeReference<Iterable<PrivacyChoice>>() { }).getBody());
 //    }
 
-    public Optional<Iterable<PrivacyChoiceResponse>> getPrivacyPolicyChoicesByAccount(String account) {
-        return remoteService.readPrivacyChoices()
-                .map(choices -> StreamSupport.stream(choices.spliterator(), false)
-                        .filter(privacyChoice -> privacyChoice.getPrivacyContent().getUser().getAccount().equals(account))
+    public Iterable<PrivacyChoiceResponse> getPrivacyPolicyChoicesByAccount(String account) {
+        return () -> StreamSupport.stream(remoteService.readPrivacyChoices().spliterator(), false)
+                .filter(choice -> choice.getPrivacyContent().getUser().getAccount().equals(account))
                 .map(choice -> privacyChoiceIndexRepository.findById(choice.getId())
                         .map(choiceIndex -> PrivacyChoiceResponse.builder()
                                 .id(choiceIndex.getId())
@@ -63,6 +106,7 @@ public class PrivacyService {
                                 .privacyChoice(choice)
                                 .build())
                         .orElseGet(() -> new PrivacyChoiceResponse()))
-                        .collect(Collectors.toList()));
+                .collect(Collectors.toList())
+                .iterator();
     }
 }

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

@@ -40,7 +40,7 @@ public class RemoteService {
                 }).getBody(), "Read devices error");
     }
 
-    public Optional<PrivacyPolicyReport> readRelatedPrivacyPolicies(String udn) {
+    public Optional<PrivacyPolicyReport> readRelatedPrivacyPolicyReport(String udn) {
         return tryCatch(() -> template.exchange(cloudAddress + "/privacy/" + udn, HttpMethod.GET, null,
                 PrivacyPolicyReport.class).getBody(), "Read privacyPolicyReport error");
     }
@@ -50,10 +50,11 @@ public class RemoteService {
                 new HttpEntity(choice), PrivacyChoice.class).getBody(), "Set privacyChoice error");
     }
 
-    public Optional<Iterable<PrivacyChoice>> readPrivacyChoices() {
+    public Iterable<PrivacyChoice> readPrivacyChoices() {
         return tryCatch(() -> template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
                 new ParameterizedTypeReference<Iterable<PrivacyChoice>>() {
-                }).getBody(), "Read privacyChoice error");
+                }).getBody(), "Read privacyChoice error")
+                .orElse(null);
     }
 
     public <T> Optional<T> tryCatch(Supplier<T> supplier, String errorMessage) {

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

@@ -7,6 +7,7 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyContent;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
+import edu.prlab.tyler.iotgateway.gateway.model.PrivacyPolicyReportResponse;
 import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import org.junit.Assert;
 import org.junit.Before;
@@ -66,7 +67,7 @@ public class GatewayHttpApiTest {
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
-        Device device= mapper.readValue(result.getResponse().getContentAsString(), Device.class);
+        Device device = mapper.readValue(result.getResponse().getContentAsString(), Device.class);
         Assert.assertNotNull(device);
 
         //取得裝置清單
@@ -83,12 +84,12 @@ public class GatewayHttpApiTest {
 
         //拿取隱私政策
         result = mvc.perform(MockMvcRequestBuilders
-                .get("/privacy/" + "a1252c49-4188-4e6d-a32e-66604c664fb8")
+                .get("/privacy/" + "a1252c49-4188-4e6d-a32e-66604c664fb8/" + "test")
                 .accept(MediaType.APPLICATION_JSON_UTF8))
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
-        PrivacyPolicyReport report = mapper.readValue(result.getResponse().getContentAsString(), PrivacyPolicyReport.class);
+        PrivacyPolicyReport report = mapper.readValue(result.getResponse().getContentAsString(), PrivacyPolicyReportResponse.class);
         Assert.assertNotNull(report);
 
         //表達隱私偏好
@@ -115,9 +116,18 @@ public class GatewayHttpApiTest {
 
         Assert.assertNotNull(result);
 
+        result = mvc.perform(MockMvcRequestBuilders
+                .get("/privacy/" + "a1252c49-4188-4e6d-a32e-66604c664fb8/" + "test")
+                .accept(MediaType.APPLICATION_JSON_UTF8))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andReturn();
+        report = mapper.readValue(result.getResponse().getContentAsString(), PrivacyPolicyReportResponse.class);
+        Assert.assertNotNull(report);
+
         //取得所有隱私偏好
         result = mvc.perform(MockMvcRequestBuilders
-                .get("/choice"+"/test1")
+                .get("/choice/" + privacyChoice.getPrivacyContent().getUser().getAccount())
                 .accept(MediaType.APPLICATION_JSON_UTF8))
                 .andDo(print())
                 .andExpect(status().isOk())