Merge pull request #159 from JakduK/develop

Develop

api/build.gradle

@@ -0,0 +1,18 @@
+description = 'api'
+
+springBoot {
+  executable = true
+}
+
+dependencies {
+  compile project(':core')
+
+  compile('org.springframework.boot:spring-boot-starter-security')
+  compile('org.springframework.boot:spring-boot-starter-mobile')
+
+  compile 'io.springfox:springfox-swagger2:2.6.1'
+  compile 'io.springfox:springfox-swagger-ui:2.6.1'
+  compile 'org.springframework.data:spring-data-rest-hal-browser:2.5.1.RELEASE'
+  compile 'io.jsonwebtoken:jjwt:0.7.0'
+}
+

api/src/main/java/com/jakduk/api/ApiApplication.java

@@ -0,0 +1,20 @@
+package com.jakduk.api;
+
+import com.jakduk.core.CoreApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+/**
+ * Created by pyohwan on 16. 10. 16.
+ */
+
+@SpringBootApplication
+public class ApiApplication {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder()
+                .parent(CoreApplication.class)
+                .child(ApiApplication.class)
+                .run(args);
+    }
+}

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmail.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmail.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -19,7 +19,7 @@
 @Constraint(validatedBy = ExistEmailValidator.class)
 public @interface ExistEmail {
 
-    String message() default "email_Exists";
+    String message() default "{validation.msg.email.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmailCompatibility.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmailCompatibility.java

@@ -1,8 +1,6 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 
-import com.jakduk.core.exception.FormValidationErrorCode;
-
 import javax.validation.Constraint;
 import javax.validation.Payload;
 import java.lang.annotation.ElementType;
@@ -23,7 +21,7 @@
 @Constraint(validatedBy = ExistEmailCompatibilityValidator.class)
 public @interface ExistEmailCompatibility {
 
-    String message() default FormValidationErrorCode.EMAIL_EXISTS;
+    String message() default "{validation.msg.email.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmailCompatibilityValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmailCompatibilityValidator.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 
 import com.jakduk.core.model.simple.UserProfile;

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmailOnEdit.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmailOnEdit.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -19,7 +19,7 @@
 @Constraint(validatedBy = ExistEmailOnEditValidator.class)
 public @interface ExistEmailOnEdit {
 
-    String message() default "email_Exists";
+    String message() default "{validation.msg.email.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmailOnEditValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmailOnEditValidator.java

@@ -1,6 +1,7 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
-import com.jakduk.core.authentication.common.CommonPrincipal;
+import com.jakduk.api.common.util.UserUtils;
+import com.jakduk.api.configuration.authentication.user.CommonPrincipal;
 import com.jakduk.core.model.simple.UserProfile;
 import com.jakduk.core.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (Objects.isNull(value))
             return false;
 
-        CommonPrincipal commonPrincipal = userService.getCommonPrincipal();
+        CommonPrincipal commonPrincipal = UserUtils.getCommonPrincipal();
 
         UserProfile existEmail = userService.findByNEIdAndEmail(commonPrincipal.getId(), value.trim());
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistEmailValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistEmailValidator.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import com.jakduk.core.model.simple.UserProfile;
 import com.jakduk.core.service.UserService;

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsername.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsername.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -17,7 +17,7 @@
 @Constraint(validatedBy = ExistUsernameValidator.class)
 public @interface ExistUsername {
 
-    String message() default "username_Exists";
+    String message() default "{validation.msg.username.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsernameCompatibility.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsernameCompatibility.java

@@ -1,6 +1,4 @@
-package com.jakduk.core.common.constraints;
-
-import com.jakduk.core.exception.FormValidationErrorCode;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -21,7 +19,7 @@
 @Constraint(validatedBy = ExistUsernameCompatibilityValidator.class)
 public @interface ExistUsernameCompatibility {
 
-    String message() default FormValidationErrorCode.USERNAME_EXISTS;
+    String message() default "{validation.msg.username.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsernameCompatibilityValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsernameCompatibilityValidator.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import com.jakduk.core.model.simple.UserProfile;
 import com.jakduk.core.service.UserService;

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsernameOnEdit.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsernameOnEdit.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -19,7 +19,7 @@
 @Constraint(validatedBy = ExistUsernameOnEditValidator.class)
 public @interface ExistUsernameOnEdit {
 
-    String message() default "username_Exists";
+    String message() default "{validation.msg.username.exists}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsernameOnEditValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsernameOnEditValidator.java

@@ -1,6 +1,7 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
-import com.jakduk.core.authentication.common.CommonPrincipal;
+import com.jakduk.api.common.util.UserUtils;
+import com.jakduk.api.configuration.authentication.user.CommonPrincipal;
 import com.jakduk.core.model.simple.UserProfile;
 import com.jakduk.core.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (Objects.isNull(value))
             return false;
 
-        CommonPrincipal commonPrincipal = userService.getCommonPrincipal();
+        CommonPrincipal commonPrincipal = UserUtils.getCommonPrincipal();
 
         UserProfile existUsername = userService.findByNEIdAndUsername(commonPrincipal.getId().trim(), value.trim());
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/ExistUsernameValidator.java → api/src/main/java/com/jakduk/api/common/constraints/ExistUsernameValidator.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import com.jakduk.core.model.simple.UserProfile;
 import com.jakduk.core.service.UserService;

jakduk-core/src/main/java/com/jakduk/core/common/constraints/FieldMatch.java → api/src/main/java/com/jakduk/api/common/constraints/FieldMatch.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -15,7 +15,7 @@
 @Documented
 public @interface FieldMatch {
 
-    String message() default "Field mismatch.";
+    String message() default "{validation.msg.field.mismatch}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/FieldMatchValidator.java → api/src/main/java/com/jakduk/api/common/constraints/FieldMatchValidator.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import org.apache.commons.beanutils.BeanUtils;
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/PasswordMatch.java → api/src/main/java/com/jakduk/api/common/constraints/PasswordMatch.java

@@ -1,4 +1,4 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -17,7 +17,7 @@
 @Constraint(validatedBy = PasswordMatchValidator.class)
 public @interface PasswordMatch {
 
-    String message() default "password_mismatch";
+    String message() default "{validation.msg.password.mismatch}";
 
     Class<?>[] groups() default {};
 

jakduk-core/src/main/java/com/jakduk/core/common/constraints/PasswordMatchValidator.java → api/src/main/java/com/jakduk/api/common/constraints/PasswordMatchValidator.java

@@ -1,8 +1,8 @@
-package com.jakduk.core.common.constraints;
+package com.jakduk.api.common.constraints;
 
-import com.jakduk.core.authentication.common.CommonPrincipal;
+import com.jakduk.api.common.util.UserUtils;
+import com.jakduk.api.configuration.authentication.user.CommonPrincipal;
 import com.jakduk.core.model.simple.UserOnPasswordUpdate;
-import com.jakduk.core.service.CommonService;
 import com.jakduk.core.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.StandardPasswordEncoder;
@@ -23,9 +23,6 @@ public class PasswordMatchValidator implements ConstraintValidator<PasswordMatch
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private CommonService commonService;
-
     @Override
     public void initialize(PasswordMatch constraintAnnotation) {
 
@@ -37,9 +34,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (Objects.isNull(value))
             return false;
 
-        CommonPrincipal commonPrincipal = userService.getCommonPrincipal();
+        CommonPrincipal commonPrincipal = UserUtils.getCommonPrincipal();
 
-        if (! commonService.isJakdukUser())
+        if (! UserUtils.isJakdukUser())
             return true;
 
         UserOnPasswordUpdate user = userService.findUserOnPasswordUpdateById(commonPrincipal.getId());

jakduk-api/src/main/java/com/jakduk/api/common/util/ApiUtils.java → api/src/main/java/com/jakduk/api/common/util/ApiUtils.java

@@ -1,6 +1,8 @@
 package com.jakduk.api.common.util;
 
 import com.jakduk.api.common.ApiConst;
+import com.jakduk.core.common.CommonConst;
+import org.springframework.mobile.device.Device;
 import org.springframework.security.web.util.UrlUtils;
 
 import javax.servlet.http.Cookie;
@@ -24,7 +26,7 @@ public class ApiUtils {
      * @param id 쿠키 이름에 쓰일 고유 ID
      * @return 쿠키를 새로 저장했다면 true, 아니면 false.
      */
-    public static boolean addViewsCookie(HttpServletRequest request, HttpServletResponse response, ApiConst.VIEWS_COOKIE_TYPE prefix, String id) {
+    public static Boolean addViewsCookie(HttpServletRequest request, HttpServletResponse response, ApiConst.VIEWS_COOKIE_TYPE prefix, String id) {
 
         String cookieName = prefix + "_" + id;
         Cookie[] cookies = request.getCookies();
@@ -58,4 +60,21 @@ public static String buildFullRequestUrl(HttpServletRequest request, String uri)
                 request.getServerPort(),
                 request.getContextPath() + uri, null);
     }
+
+    /**
+     * 모바일 디바이스 정보 가져오기.
+     * @param device Device 객체
+     * @return CommonConst.DEVICE_TYPE enum 타입
+     */
+    public static CommonConst.DEVICE_TYPE getDeviceInfo(Device device) {
+        if (device.isNormal()) {
+            return CommonConst.DEVICE_TYPE.NORMAL;
+        } else if (device.isMobile()) {
+            return CommonConst.DEVICE_TYPE.MOBILE;
+        } else if (device.isTablet()) {
+            return CommonConst.DEVICE_TYPE.TABLET;
+        } else {
+            return CommonConst.DEVICE_TYPE.NORMAL;
+        }
+    }
 }

jakduk-api/src/main/java/com/jakduk/api/common/util/JwtTokenUtils.java → api/src/main/java/com/jakduk/api/common/util/JwtTokenUtils.java

@@ -1,7 +1,7 @@
 package com.jakduk.api.common.util;
 
 import com.jakduk.api.common.vo.AttemptSocialUser;
-import com.jakduk.core.authentication.common.CommonPrincipal;
+import com.jakduk.api.configuration.authentication.user.CommonPrincipal;
 import com.jakduk.core.common.CommonConst;
 import com.jakduk.core.exception.ServiceError;
 import com.jakduk.core.exception.ServiceException;