Merge pull request #90 from JakduK/restful-api

Restful api
JakduK · Jul 27, 2016 · 082e315 · 082e315
2 parents 906bed8 + 89c356c
commit 082e315
Show file tree

Hide file tree

Showing 186 changed files with 5,481 additions and 5,800 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ allprojects  {
     apply plugin: 'idea'
 
     group = 'com.jakduk'
-    version = '0.6.2-SNAPSHOT'
+    version = '0.7.0-SNAPSHOT'
 }
 
 subprojects {
@@ -17,7 +17,7 @@ subprojects {
     // test task에서 spring profile을 위한 설정.
     test {
         systemProperties = [
-                'spring.profiles.active':'production'
+                'spring.profiles.active':'local'
         ]
     }
 
@@ -32,12 +32,8 @@ subprojects {
     }
 
     dependencies {
-        compile group: 'javax.mail', name: 'mail', version:'1.4.7'
-        compile group: 'org.apache.velocity', name: 'velocity', version:'1.7'
-        compile(group: 'org.apache.velocity', name: 'velocity-tools', version:'2.0') {
-            exclude(module: 'servlet-api')
-        }
         compile group: 'org.springframework', name: 'spring-oxm', version:"${springVersion}"
+        compile group: 'org.springframework', name: 'spring-web', version:"${springVersion}"
         compile group: 'org.springframework', name: 'spring-webmvc', version:"${springVersion}"
         compile group: 'org.springframework', name: 'spring-aspects', version:"${springVersion}"
         compile group: 'org.springframework', name: 'spring-jdbc', version:"${springVersion}"
@@ -60,7 +56,6 @@ subprojects {
         compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:"${jacksonVerstion}"
         compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:"${jacksonVerstion}"
         compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:"${jacksonVerstion}"
-        compile group: 'com.googlecode.json-simple', name: 'json-simple', version:'1.1.1'
         compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
         compile group: 'org.slf4j', name: 'jcl-over-slf4j', version:'1.7.21'
         compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.7'
@@ -72,10 +67,14 @@ subprojects {
         compile group: 'org.elasticsearch', name: 'elasticsearch', version:'1.7.5'
         compile group: 'io.searchbox', name: 'jest', version:'2.0.2'
         compile group: 'net.gpedro.integrations.slack', name: 'slack-webhook', version:'1.1.1'
+        compile group: 'javax.mail', name: 'mail', version:'1.4.7'
+        compile 'commons-beanutils:commons-beanutils:1.9.2'
+        compile 'org.freemarker:freemarker:2.3.23'
 
         testCompile group: 'org.springframework', name: 'spring-test', version:"${springVersion}"
         testCompile group: 'junit', name: 'junit', version:'4.12'
+        testCompile 'org.mockito:mockito-all:1.10.19'
 
-        compileOnly 'org.projectlombok:lombok:1.16.8'
+        compileOnly 'org.projectlombok:lombok:1.16.10'
     }
 }
diff --git a/changelog/db_migration.txt b/changelog/db_migration.txt
@@ -1,4 +1,40 @@
 
+Version 0.7.0 / 2016-07-27
+
+// 자유게시판 말머리 enum으로 변경.
+db.boardFree.update({"categoryName":"football"}, {$set:{"category":"FOOTBALL"}}, {multi:true})
+db.boardFree.update({"categoryName":"free"}, {$set:{"category":"FREE"}}, {multi:true})
+db.boardFree.update({"categoryName":"develop"}, {$set:{"category":"FREE"}}, {multi:true})
+db.boardFree.update({}, {$unset:{"categoryName":""}}, {multi:true})
+
+// 디바이스 enum으로 변경.
+db.boardFree.update({'status.device':'normal'}, {$set:{'status.device':'NORMAL'}}, {multi:true})
+db.boardFree.update({'status.device':'mobile'}, {$set:{'status.device':'MOBILE'}}, {multi:true})
+db.boardFree.update({'status.device':'tablet'}, {$set:{'status.device':'TABLET'}}, {multi:true})
+db.boardFree.update({'status.delete':'delete'}, {$set:{'status.delete':true}}, {multi:true})
+db.boardFree.update({'status.notice':'notice'}, {$set:{'status.notice':true}}, {multi:true})
+db.boardFreeComment.update({'status.device':'normal'}, {$set:{'status.device':'NORMAL'}}, {multi:true})
+db.boardFreeComment.update({'status.device':'mobile'}, {$set:{'status.device':'MOBILE'}}, {multi:true})
+db.boardFreeComment.update({'status.device':'tablet'}, {$set:{'status.device':'TABLET'}}, {multi:true})
+db.jakduComment.update({'status.device':'normal'}, {$set:{'status.device':'NORMAL'}}, {multi:true})
+db.jakduComment.update({'status.device':'mobile'}, {$set:{'status.device':'MOBILE'}}, {multi:true})
+db.jakduComment.update({'status.device':'tablet'}, {$set:{'status.device':'TABLET'}}, {multi:true})
+
+// 글 이력 enum으로 변경. (여러번 시도해야 전부 업데이트 가능)
+db.boardFree.update({'history.type':'create'}, {$set:{'history.$.type':'CREATE'}}, {multi:true})
+db.boardFree.update({'history.type':'delete'}, {$set:{'history.$.type':'DELETE'}}, {multi:true})
+db.boardFree.update({'history.type':'edit'}, {$set:{'history.$.type':'EDIT'}}, {multi:true})
+db.boardFree.update({'history.type':'notice'}, {$set:{'history.$.type':'ENABLE_NOTICE'}}, {multi:true})
+db.boardFree.update({'history.type':'c.notice'}, {$set:{'history.$.type':'DISABLE_NOTICE'}}, {multi:true})
+
+// 사진 상태 enum으로 변경.
+db.gallery.update({'status.from':'freeBoard'}, {$set:{'status.from':'BOARD_FREE'}}, {multi:true})
+db.gallery.update({'status.status':'temp'}, {$set:{'status.status':'TEMP'}}, {multi:true})
+db.gallery.update({'status.status':'use'}, {$set:{'status.status':'ENABLE'}}, {multi:true})
+
+// sequence enum으로 변경.
+db.sequence.update({'name':'freeBoard'}, {$set:{'name':'BOARD_FREE'}});
+
 Version 0.6.1 / 2016-05-07
 
 // JakduK 계정의 providerId 추가
@@ -30,4 +66,4 @@ db.user.update({'oauthUser.type' : 'facebook'}, {$set:{'providerId':'FACEBOOK'}}
 // SNS 계정으로 가인한 회원 정보에 providerUserId : 해당 oauthUser.oauthId를 추가한다.
 db.user.find({'oauthUser' : {$exists: true}}).forEach(function(doc){
        db.user.update({_id:doc._id}, {$set:{"providerUserId":doc.oauthUser.oauthId}});
-});
+});
diff --git a/custom-lib/spring-social-daum-0.1.1.jar b/custom-lib/spring-social-daum-0.1.1.jar
diff --git a/jakduk-common/src/main/java/com/jakduk/authentication/common/CommonPrincipal.java b/jakduk-common/src/main/java/com/jakduk/authentication/common/CommonPrincipal.java
@@ -1,10 +1,14 @@
 package com.jakduk.authentication.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.jakduk.common.CommonConst;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import com.jakduk.service.CommonService;
+import lombok.*;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * @author <a href="mailto:phjang1983@daum.net">Jang,Pyohwan</a>
@@ -18,7 +22,7 @@
 @NoArgsConstructor
 @Data
 public class CommonPrincipal {
-	
+
 	private String id;
 
 	private String email;

diff --git a/jakduk-common/src/main/java/com/jakduk/authentication/common/CommonUser.java b/jakduk-common/src/main/java/com/jakduk/authentication/common/CommonUser.java
diff --git a/...uthentication/jakduk/JakdukPrincipal.java → ...uthentication/common/JakdukPrincipal.java b/...uthentication/jakduk/JakdukPrincipal.java → ...uthentication/common/JakdukPrincipal.java
@@ -1,4 +1,4 @@
-package com.jakduk.authentication.jakduk;
+package com.jakduk.authentication.common;
 
 import com.jakduk.common.CommonConst;
 import org.springframework.security.core.CredentialsContainer;

diff --git a/jakduk-common/src/main/java/com/jakduk/authentication/common/OAuthDetailService.java b/jakduk-common/src/main/java/com/jakduk/authentication/common/OAuthDetailService.java
diff --git a/jakduk-common/src/main/java/com/jakduk/authentication/common/OAuthFailureHandler.java b/jakduk-common/src/main/java/com/jakduk/authentication/common/OAuthFailureHandler.java