PrivacyChoice api

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java

 package edu.prlab.tyler.iotgateway.cloud.config;
 
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Manufacturer;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Model;
@@ -37,7 +36,7 @@ public class DefaultData implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
 
-//        SensitiveUser user = SensitiveUser.builder()
+//        User user = User.builder()
 //                .username("test")
 //                .password("test")
 //                .build();

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

 package edu.prlab.tyler.iotgateway.cloud.controllers;
 
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
 import edu.prlab.tyler.iotgateway.cloud.services.DeviceService;
@@ -45,7 +44,7 @@ public class DeviceController {
     }
 
 //    @GetMapping
-//    public ResponseEntity<Iterable<Device>> readDevicesByUser(SensitiveUser user) {
+//    public ResponseEntity<Iterable<Device>> readDevicesByUser(User user) {
 //    }
 
     @PostMapping("/privacy")

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.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.services.PrivacyChoiceService;
 import edu.prlab.tyler.iotgateway.cloud.services.SensitiveUserService;

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/auth/SensitiveUser.java → cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/auth/User.java

@@ -14,7 +14,7 @@ import javax.persistence.Id;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class SensitiveUser {
+public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

 package edu.prlab.tyler.iotgateway.cloud.pojo.privacy;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
+import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -25,7 +25,7 @@ public class PrivacyContent {
 
     @OneToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "user_id")
-    private SensitiveUser user;
+    private User user;
 
     @OneToOne
     @JoinColumn(name = "device_id")

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

 package edu.prlab.tyler.iotgateway.cloud.repositories;
 
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
+import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface SensitiveUserRepository extends JpaRepository<SensitiveUser, Long> {
+public interface SensitiveUserRepository extends JpaRepository<User, Long> {
 }

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

 package edu.prlab.tyler.iotgateway.cloud.services;
 
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
+import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
 import edu.prlab.tyler.iotgateway.cloud.repositories.SensitiveUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,7 +16,7 @@ public class SensitiveUserService  {
         this.repository = repository;
     }
 
-    public Optional<SensitiveUser> add(SensitiveUser pojo) {
+    public Optional<User> add(User pojo) {
         return Optional.of(repository.saveAndFlush(pojo));
     }
 }

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

@@ -3,7 +3,7 @@ package edu.prlab.tyler.iotgateway.cloud;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
+import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Icon;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Model;
@@ -178,7 +178,7 @@ public class CloudHttpApiTest {
 
         PrivacyChoice privacyChoice = PrivacyChoice.builder()
                 .privacyContent(PrivacyContent.builder()
-                        .user(SensitiveUser.builder()
+                        .user(User.builder()
                                 .username("test")
                                 .password("test")
                                 .build())

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/config/DefaultData.java

 package edu.prlab.tyler.iotgateway.gateway.config;
 
-import edu.prlab.tyler.iotgateway.gateway.pojo.auth.User;
+import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.gateway.services.UserService;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -16,7 +16,7 @@ public class DefaultData implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        User defaultUser = userService.registerNewUser(User.builder().username("testUser0").password("testUser0").build()).get();
+        SensitiveUser defaultUser = userService.registerNewUser(SensitiveUser.builder().username("testUser0").password("testUser0").build()).get();
         System.out.println(defaultUser.toString());
     }
 }

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

 package edu.prlab.tyler.iotgateway.gateway.controllers;
 
-import edu.prlab.tyler.iotgateway.gateway.pojo.auth.User;
+import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.gateway.services.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -18,14 +18,14 @@ public class UserController {
     }
 
     @PostMapping("/user")
-    public ResponseEntity<User> register(@RequestBody User user) {
+    public ResponseEntity<SensitiveUser> register(@RequestBody SensitiveUser user) {
         return userService.registerNewUser(user)
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.noContent().build());
     }
 
     @PostMapping("/login")
-    public ResponseEntity<User> login(@RequestBody User user) {
+    public ResponseEntity<SensitiveUser> login(@RequestBody SensitiveUser user) {
         return userService.login(user)
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.noContent().build());

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/auth/User.java → gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/auth/SensitiveUser.java

@@ -17,7 +17,7 @@ import javax.persistence.Id;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class User {
+public class SensitiveUser {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JsonIgnore

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/repositories/UserRepository.java

 package edu.prlab.tyler.iotgateway.gateway.repositories;
 
-import edu.prlab.tyler.iotgateway.gateway.pojo.auth.User;
+import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 @Repository
-public interface UserRepository extends CrudRepository<User, Long> {
-    User findUserByUsername(String username);
+public interface UserRepository extends CrudRepository<SensitiveUser, Long> {
+    SensitiveUser findUserByUsername(String username);
     boolean existsByUsername(String username);
 }

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

@@ -59,15 +59,15 @@ public class PrivacyService {
 //    }
 
     public Iterable<PrivacyChoiceResponse> getPrivacyPolicyChoices() {
-        return () -> StreamSupport.stream(template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
-                new ParameterizedTypeReference<Iterable<PrivacyChoice>>() {
-                }).getBody().spliterator(), false)
+        return () -> StreamSupport.stream(
+                template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
+                        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()).get()).iterator();
     }
 }

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

 package edu.prlab.tyler.iotgateway.gateway.services;
 
-import edu.prlab.tyler.iotgateway.gateway.pojo.auth.User;
+import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import edu.prlab.tyler.iotgateway.gateway.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,16 +18,16 @@ public class UserService {
 
     //TODO
     //需要增加加密機制
-    public Optional<User> registerNewUser(User user) {
+    public Optional<SensitiveUser> registerNewUser(SensitiveUser user) {
         return Optional.ofNullable(user)
-                .map(User::getUsername)
+                .map(SensitiveUser::getUsername)
                 .filter(username->!userRepository.existsByUsername(username))
                 .map(username -> userRepository.save(user));
     }
 
     //TODO
     //需要增加解密確認
-    public Optional<User> login(User user) {
+    public Optional<SensitiveUser> login(SensitiveUser user) {
         return Optional.ofNullable(user.getUsername())
                 .map(username -> userRepository.findUserByUsername(username))
                 .filter(sensitiveUser->sensitiveUser.getPassword().equals(user.getPassword()));

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

@@ -2,12 +2,12 @@ package edu.prlab.tyler.iotgateway.gateway;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.SensitiveUser;
+import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
 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.pojo.auth.User;
+import edu.prlab.tyler.iotgateway.gateway.pojo.auth.SensitiveUser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,7 +51,7 @@ public class GatewayHttpApiTest {
                 .post("/login")
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .accept(MediaType.APPLICATION_JSON_UTF8)
-                .content(mapper.writeValueAsString(User.builder().username("testUser0").password("testUser0").build())))
+                .content(mapper.writeValueAsString(SensitiveUser.builder().username("testUser0").password("testUser0").build())))
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
@@ -74,7 +74,7 @@ public class GatewayHttpApiTest {
                 .post("/device/" + "a1252c49-4188-4e6d-a32e-66604c664fb8")
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .accept(MediaType.APPLICATION_JSON_UTF8)
-                .content(mapper.writeValueAsString(User.builder().username("testUser0").password("testUser0").build())))
+                .content(mapper.writeValueAsString(SensitiveUser.builder().username("testUser0").password("testUser0").build())))
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
@@ -95,7 +95,7 @@ public class GatewayHttpApiTest {
         device = report.getDevice();
         PrivacyChoice privacyChoice = PrivacyChoice.builder()
                 .privacyContent(PrivacyContent.builder()
-                        .user(SensitiveUser.builder()
+                        .user(User.builder()
                                 .username("test")
                                 .password("test")
                                 .build())