머지용

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset=utf-8
+end_of_line=lf
+indent_style=space
+indent_size=4
+insert_final_newline=true
+disabled_rules=no-wildcard-imports,import-ordering,comment-spacing
+
+[*.{kt,kts}]
+insert_final_newline=false

api-repository/build.gradle

@@ -0,0 +1,12 @@
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
+}
+
+
+dependencies {
+    api project(':data')
+}

api-repository/src/main/java/com/walking/api/repository/config/ApiRepositoryConfig.java

@@ -0,0 +1,15 @@
+package com.walking.api.repository.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackages = ApiRepositoryConfig.BASE_PACKAGE)
+public class ApiRepositoryConfig {
+
+	public static final String BASE_PACKAGE = "com.walking.api.repository";
+	public static final String SERVICE_NAME = "walking";
+	public static final String MODULE_NAME = "api-repository";
+	public static final String BEAN_NAME_PREFIX = "apiRepository";
+	public static final String PROPERTY_PREFIX = SERVICE_NAME + "." + MODULE_NAME;
+}

api/src/main/java/com/walking/api/config/ApiDataConfig.java → api-repository/src/main/java/com/walking/api/repository/config/ApiRepositoryDataConfig.java

@@ -1,9 +1,9 @@
-package com.walking.api.config;
+package com.walking.api.repository.config;
 
 import com.walking.data.DataConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @Import({DataConfig.class})
-public class ApiDataConfig {}
+public class ApiRepositoryDataConfig {}

api/src/main/java/com/walking/api/config/ApiDataSourceConfig.java → api-repository/src/main/java/com/walking/api/repository/config/ApiRepositoryDataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.walking.api.config;
+package com.walking.api.repository.config;
 
 import javax.sql.DataSource;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -15,12 +15,12 @@
 			DataSourceAutoConfiguration.class,
 			DataSourceTransactionManagerAutoConfiguration.class,
 		})
-public class ApiDataSourceConfig {
+public class ApiRepositoryDataSourceConfig {
 
-	public static final String DATASOURCE_NAME = ApiAppConfig.BEAN_NAME_PREFIX + "DataSource";
+	public static final String DATASOURCE_NAME = ApiRepositoryConfig.BEAN_NAME_PREFIX + "DataSource";
 
 	@Bean(name = DATASOURCE_NAME)
-	@ConfigurationProperties(prefix = "spring.datasource")
+	@ConfigurationProperties(prefix = "api.datasource")
 	public DataSource dataSource() {
 		return DataSourceBuilder.create().build();
 	}

api/src/main/java/com/walking/api/config/ApiEntityConfig.java → api-repository/src/main/java/com/walking/api/repository/config/ApiRepositoryEntityConfig.java

@@ -1,6 +1,6 @@
-package com.walking.api.config;
+package com.walking.api.repository.config;
 
-import static com.walking.api.config.ApiDataSourceConfig.DATASOURCE_NAME;
+import static com.walking.api.repository.config.ApiRepositoryDataSourceConfig.DATASOURCE_NAME;
 
 import com.walking.data.DataConfig;
 import com.walking.data.config.HibernatePropertyMapProvider;
@@ -17,10 +17,11 @@
 
 @Configuration
 @RequiredArgsConstructor
-public class ApiEntityConfig {
+public class ApiRepositoryEntityConfig {
 	public static final String ENTITY_MANAGER_FACTORY_NAME =
-			ApiAppConfig.BEAN_NAME_PREFIX + "EntityManagerFactory";
-	private static final String PERSIST_UNIT = ApiAppConfig.BEAN_NAME_PREFIX + "PersistenceUnit";
+			ApiRepositoryConfig.BEAN_NAME_PREFIX + "EntityManagerFactory";
+	private static final String PERSIST_UNIT =
+			ApiRepositoryConfig.BEAN_NAME_PREFIX + "PersistenceUnit";
 
 	private final HibernatePropertyMapProvider hibernatePropertyMapProvider;
 

api/src/main/java/com/walking/api/config/ApiJpaConfig.java → api-repository/src/main/java/com/walking/api/repository/config/ApiRepositoryJpaConfig.java

@@ -1,4 +1,4 @@
-package com.walking.api.config;
+package com.walking.api.repository.config;
 
 import javax.persistence.EntityManagerFactory;
 import org.springframework.context.annotation.Bean;
@@ -13,13 +13,13 @@
 @EnableJpaAuditing
 @EnableTransactionManagement
 @EnableJpaRepositories(
-		basePackages = ApiAppConfig.BASE_PACKAGE,
-		transactionManagerRef = ApiJpaConfig.TRANSACTION_MANAGER_NAME,
-		entityManagerFactoryRef = ApiEntityConfig.ENTITY_MANAGER_FACTORY_NAME)
-public class ApiJpaConfig {
+		basePackages = ApiRepositoryConfig.BASE_PACKAGE,
+		transactionManagerRef = ApiRepositoryJpaConfig.TRANSACTION_MANAGER_NAME,
+		entityManagerFactoryRef = ApiRepositoryEntityConfig.ENTITY_MANAGER_FACTORY_NAME)
+public class ApiRepositoryJpaConfig {
 
 	public static final String TRANSACTION_MANAGER_NAME =
-			ApiAppConfig.BEAN_NAME_PREFIX + "TransactionalManager";
+			ApiRepositoryConfig.BEAN_NAME_PREFIX + "TransactionalManager";
 
 	@Bean(name = TRANSACTION_MANAGER_NAME)
 	public PlatformTransactionManager transactionManager(EntityManagerFactory emf) {

api-repository/src/main/java/com/walking/api/repository/dao/member/MemberRepository.java

@@ -0,0 +1,16 @@
+package com.walking.api.repository.dao.member;
+
+import com.walking.data.entity.member.MemberEntity;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
+
+	boolean existsByIdAndDeletedFalse(Long id);
+
+	Optional<MemberEntity> findByIdAndDeletedFalse(Long id);
+
+	Optional<MemberEntity> findByCertificationIdAndDeletedFalse(String certificationId);
+}

api-repository/src/main/java/com/walking/api/repository/dao/member/PathFavoritesRepository.java

@@ -0,0 +1,8 @@
+package com.walking.api.repository.dao.member;
+
+import com.walking.data.entity.path.PathFavoritesEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PathFavoritesRepository extends JpaRepository<PathFavoritesEntity, Long> {}

api/src/main/java/com/walking/api/repository/traffic/TrafficDetailRepository.java → api-repository/src/main/java/com/walking/api/repository/dao/traffic/TrafficDetailRepository.java

@@ -1,4 +1,4 @@
-package com.walking.api.repository.traffic;
+package com.walking.api.repository.dao.traffic;
 
 import com.walking.data.entity.traffic.TrafficDetailEntity;
 import java.util.List;

api/src/main/java/com/walking/api/repository/traffic/TrafficFavoritesRepository.java → api-repository/src/main/java/com/walking/api/repository/dao/traffic/TrafficFavoritesRepository.java

@@ -1,4 +1,4 @@
-package com.walking.api.repository.traffic;
+package com.walking.api.repository.dao.traffic;
 
 import com.walking.data.entity.member.MemberEntity;
 import com.walking.data.entity.member.TrafficFavoritesEntity;

api/src/main/java/com/walking/api/repository/traffic/TrafficRepository.java → api-repository/src/main/java/com/walking/api/repository/dao/traffic/TrafficRepository.java

@@ -1,4 +1,4 @@
-package com.walking.api.repository.traffic;
+package com.walking.api.repository.dao.traffic;
 
 import com.walking.data.entity.traffic.TrafficEntity;
 import java.util.List;

api-repository/src/main/resources/application-api-repository-dev.yml

@@ -0,0 +1,6 @@
+api:
+    datasource:
+        jdbc-url: ${DB_HOSTNAME}/api?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        username: ${DB_USERNAME}
+        password: ${DB_PASSWORD}
+        driver-class-name: com.mysql.cj.jdbc.Driver

api-repository/src/main/resources/application-api-repository-local.yml

@@ -0,0 +1,6 @@
+api:
+    datasource:
+        jdbc-url: jdbc:mysql://localhost:13306/api?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        username: root
+        password: root
+        driver-class-name: com.mysql.cj.jdbc.Driver

api-repository/src/main/resources/application-api-repository-prod.yml

@@ -0,0 +1,6 @@
+api:
+    datasource:
+        jdbc-url: ${DB_HOSTNAME}/api?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        username: ${DB_USERNAME}
+        password: ${DB_PASSWORD}
+        driver-class-name: com.mysql.cj.jdbc.Driver

api-repository/src/main/resources/application-api-repository.yml

@@ -0,0 +1,6 @@
+api:
+    datasource:
+        jdbc-url: ${DB_HOSTNAME}/api?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        username: ${DB_USERNAME}
+        password: ${DB_PASSWORD}
+        driver-class-name: com.mysql.cj.jdbc.Driver

api/build.gradle

@@ -8,7 +8,8 @@ dependencyManagement {
 }
 
 dependencies {
-    implementation project(':data')
+    implementation project(':api-repository')
+    implementation project(':member-api')
 
     // web
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -39,6 +40,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: "${jsr305Version}"
 
+    implementation 'org.json:json:20200518'
+
 
     // security
     implementation 'org.springframework.boot:spring-boot-starter-security'

api/src/main/java/com/walking/api/config/ApiAppConfig.java

@@ -1,8 +1,11 @@
 package com.walking.api.config;
 
+import com.walking.member.api.config.MemberApiConfig;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
+@Import({MemberApiConfig.class})
 @Configuration
 @ComponentScan(basePackages = ApiAppConfig.BASE_PACKAGE)
 public class ApiAppConfig {

api/src/main/java/com/walking/api/domain/traffic/usecase/AddFavoriteTrafficUseCase.java

@@ -1,7 +1,7 @@
 package com.walking.api.domain.traffic.usecase;
 
 import com.walking.api.domain.traffic.dto.AddFavoriteTrafficUseCaseRequest;
-import com.walking.api.repository.traffic.TrafficFavoritesRepository;
+import com.walking.api.repository.dao.traffic.TrafficFavoritesRepository;
 import com.walking.data.entity.member.MemberEntity;
 import com.walking.data.entity.member.TrafficFavoritesEntity;
 import com.walking.data.entity.traffic.TrafficEntity;

api/src/main/java/com/walking/api/domain/traffic/usecase/BrowseFavoriteTrafficsUseCase.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.walking.api.domain.traffic.dto.BrowseFavoriteTrafficsUseCaseRequest;
-import com.walking.api.repository.traffic.TrafficFavoritesRepository;
+import com.walking.api.repository.dao.traffic.TrafficFavoritesRepository;
 import com.walking.api.web.dto.response.BrowseFavoriteTrafficsResponse;
 import com.walking.api.web.dto.response.detail.FavoriteTrafficDetail;
 import com.walking.api.web.dto.response.detail.PointDetail;

api/src/main/java/com/walking/api/domain/traffic/usecase/DeleteFavoriteTrafficUseCase.java

@@ -1,7 +1,7 @@
 package com.walking.api.domain.traffic.usecase;
 
 import com.walking.api.domain.traffic.dto.DeleteFavoriteTrafficUseCaseRequest;
-import com.walking.api.repository.traffic.TrafficFavoritesRepository;
+import com.walking.api.repository.dao.traffic.TrafficFavoritesRepository;
 import com.walking.data.entity.member.MemberEntity;
 import com.walking.data.entity.member.TrafficFavoritesEntity;
 import lombok.RequiredArgsConstructor;

api/src/main/java/com/walking/api/domain/traffic/usecase/UpdateFavoriteTrafficUseCase.java

@@ -1,7 +1,7 @@
 package com.walking.api.domain.traffic.usecase;
 
 import com.walking.api.domain.traffic.dto.UpdateFavoriteTrafficUseCaseRequest;
-import com.walking.api.repository.traffic.TrafficFavoritesRepository;
+import com.walking.api.repository.dao.traffic.TrafficFavoritesRepository;
 import com.walking.data.entity.member.TrafficFavoritesEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

api/src/main/java/com/walking/api/service/TrafficCurrentDetailPredictService.java

@@ -1,6 +1,6 @@
 package com.walking.api.service;
 
-import com.walking.api.repository.traffic.TrafficDetailRepository;
+import com.walking.api.repository.dao.traffic.TrafficDetailRepository;
 import com.walking.api.service.dto.ColorAndTimeLeft;
 import com.walking.api.service.dto.PredictedData;
 import com.walking.api.service.dto.request.CurrentDetailRequestDto;

api/src/main/java/com/walking/api/service/TrafficCyclePredictServiceImpl.java

@@ -1,7 +1,7 @@
 package com.walking.api.service;
 
-import com.walking.api.repository.traffic.TrafficDetailRepository;
-import com.walking.api.repository.traffic.TrafficRepository;
+import com.walking.api.repository.dao.traffic.TrafficDetailRepository;
+import com.walking.api.repository.dao.traffic.TrafficRepository;
 import com.walking.api.service.dto.PredictedData;
 import com.walking.api.service.dto.request.CyclePredictionRequestDto;
 import com.walking.api.util.OffsetDateTimeCalculator;

api/src/main/java/com/walking/api/service/path/ExtractPathTrafficInfoService.java

@@ -1,6 +1,6 @@
 package com.walking.api.service.path;
 
-import com.walking.api.repository.traffic.TrafficRepository;
+import com.walking.api.repository.dao.traffic.TrafficRepository;
 import com.walking.api.service.dto.PathTrafficData;
 import com.walking.api.util.JsonParser;
 import com.walking.data.entity.path.TrafficDirection;

api/src/main/java/com/walking/api/service/path/ReadFavoritesPathService.java

@@ -1,7 +1,7 @@
 package com.walking.api.service.path;
 
+import com.walking.api.repository.dao.member.MemberRepository;
 import com.walking.api.repository.dto.response.PathFavoritesVo;
-import com.walking.api.repository.member.MemberRepository;
 import com.walking.api.repository.path.PathFavoritesRepository;
 import com.walking.api.service.dto.response.ReadFavoritesPathResponse;
 import com.walking.api.web.dto.request.OrderFilter;

api/src/main/java/com/walking/api/service/path/RouteDetailResponseService.java

@@ -1,7 +1,7 @@
 package com.walking.api.service.path;
 
 import com.walking.api.converter.TrafficDetailConverter;
-import com.walking.api.repository.traffic.TrafficRepository;
+import com.walking.api.repository.dao.traffic.TrafficRepository;
 import com.walking.api.service.TrafficIntegrationPredictService;
 import com.walking.api.service.dto.PathPrimaryData;
 import com.walking.api.service.dto.PathTrafficData;

api/src/main/java/com/walking/api/service/traffic/ReadTrafficFavoritesService.java

@@ -1,6 +1,6 @@
 package com.walking.api.service.traffic;
 
-import com.walking.api.repository.traffic.TrafficFavoritesRepository;
+import com.walking.api.repository.dao.traffic.TrafficFavoritesRepository;
 import com.walking.data.entity.member.MemberEntity;
 import com.walking.data.entity.member.TrafficFavoritesEntity;
 import java.util.List;

api/src/main/java/com/walking/api/service/traffic/ReadTrafficService.java

@@ -1,6 +1,6 @@
 package com.walking.api.service.traffic;
 
-import com.walking.api.repository.traffic.TrafficRepository;
+import com.walking.api.repository.dao.traffic.TrafficRepository;
 import com.walking.data.entity.traffic.TrafficEntity;
 import java.util.List;
 import lombok.RequiredArgsConstructor;