v2.0.1

.github/workflows/cd-dev.yml

@@ -32,14 +32,14 @@ jobs:
 
       - name: docker image 빌드 및 푸시 (Spring)
         run: |
-          docker build --platform linux/amd64 -t makerscrew/main .
-          docker push makerscrew/main
+          docker build --platform linux/amd64 -t makerscrew/main:develop .
+          docker push makerscrew/main:develop
         working-directory: ${{ env.working-directory-spring }}
 
       - name: docker image 빌드 및 푸시 (nestjs)
         run: |
-          docker build --platform linux/amd64 -t makerscrew/server .
-          docker push makerscrew/server
+          docker build --platform linux/amd64 -t makerscrew/server:develop .
+          docker push makerscrew/server:develop
         working-directory: ${{ env.working-directory-nestjs }}
 
       - name: 도커 컨테이너 실행

.github/workflows/cd-prod.yml

@@ -32,14 +32,14 @@ jobs:
 
       - name: docker image 빌드 및 푸시 (Spring)
         run: |
-          docker build --platform linux/amd64 -t makerscrew/main .
-          docker push makerscrew/main
+          docker build --platform linux/amd64 -t makerscrew/main:production .
+          docker push makerscrew/main:production
         working-directory: ${{ env.working-directory-spring }}
 
       - name: docker image 빌드 및 푸시 (nestjs)
         run: |
-          docker build --platform linux/amd64 -t makerscrew/server .
-          docker push makerscrew/server
+          docker build --platform linux/amd64 -t makerscrew/server:production .
+          docker push makerscrew/server:production
         working-directory: ${{ env.working-directory-nestjs }}
 
       - name: 도커 컨테이너 실행

main/build.gradle

@@ -78,6 +78,9 @@ dependencies {
 
     // csv 관련
     implementation 'com.opencsv:opencsv:5.5.2'
+
+    // prometheus
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 }
 
 tasks.named('test') {

main/src/main/java/org/sopt/makers/crew/main/advertisement/dto/AdvertisementGetDto.java

@@ -1,5 +1,7 @@
 package org.sopt.makers.crew.main.advertisement.dto;
 
+import java.time.LocalDateTime;
+
 import org.sopt.makers.crew.main.entity.advertisement.Advertisement;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -12,6 +14,10 @@
 @Schema(name = "AdvertisementImageDto", description = "광고 구좌 이미지 Dto")
 public class AdvertisementGetDto {
 
+	@Schema(description = "광고 id", example = "3")
+	@NotNull
+	private final Integer advertisementId;
+
 	@Schema(description = "[Desktop] 광고 구좌 이미지 url", example = "[pc 버전 url 형식]")
 	@NotNull
 	private final String desktopImageUrl;
@@ -24,8 +30,13 @@ public class AdvertisementGetDto {
 	@NotNull
 	private final String advertisementLink;
 
+	@Schema(description = "광고 게시 시작일", example = "2024-07-31T00:00:00")
+	@NotNull
+	private final LocalDateTime advertisementStartDate;
+
 	public static AdvertisementGetDto of(Advertisement advertisement) {
-		return new AdvertisementGetDto(advertisement.getAdvertisementDesktopImageUrl(),
-			advertisement.getAdvertisementMobileImageUrl(), advertisement.getAdvertisementLink());
+		return new AdvertisementGetDto(advertisement.getId(), advertisement.getAdvertisementDesktopImageUrl(),
+			advertisement.getAdvertisementMobileImageUrl(), advertisement.getAdvertisementLink(),
+			advertisement.getAdvertisementStartDate());
 	}
 }

main/src/main/java/org/sopt/makers/crew/main/comment/v2/CommentV2Api.java

@@ -112,21 +112,6 @@ ResponseEntity<CommentV2GetCommentsResponseDto> getComments(
 		@Valid @ModelAttribute @Parameter(hidden = true) CommentV2GetCommentsQueryDto request,
 		Principal principal);
 
-	@Operation(summary = "[TEMP] 모임 게시글 댓글 리스트 조회")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiResponses(value = {
-		@ApiResponse(
-			responseCode = "200",
-			description = "성공"),
-	})
-	@Parameters({
-		@Parameter(name = "page", description = "페이지, default = 1", example = "1", schema = @Schema(type = "integer", format = "int32")),
-		@Parameter(name = "take", description = "가져올 데이터 개수, default = 12", example = "50", schema = @Schema(type = "integer", format = "int32")),
-		@Parameter(name = "postId", description = "게시글 id", example = "3", schema = @Schema(type = "integer", format = "int32"))})
-	ResponseEntity<TempResponseDto<CommentV2GetCommentsResponseDto>> getCommentsTemp(
-		@Valid @ModelAttribute @Parameter(hidden = true) CommentV2GetCommentsQueryDto request,
-		Principal principal);
-
 	@Operation(summary = "모임 게시글 댓글 좋아요 토글")
 	@ResponseStatus(HttpStatus.CREATED)
 	@ApiResponses(value = {

main/src/main/java/org/sopt/makers/crew/main/comment/v2/CommentV2Controller.java

@@ -101,19 +101,6 @@ public ResponseEntity<CommentV2GetCommentsResponseDto> getComments(
 		return ResponseEntity.status(HttpStatus.OK).body(commentDtos);
 	}
 
-	@Override
-	@GetMapping("/temp")
-	public ResponseEntity<TempResponseDto<CommentV2GetCommentsResponseDto>> getCommentsTemp(
-		@Valid @ModelAttribute @Parameter(hidden = true) CommentV2GetCommentsQueryDto request,
-		Principal principal) {
-
-		Integer userId = UserUtil.getUserId(principal);
-		CommentV2GetCommentsResponseDto commentDtos = commentV2Service.getComments(request.getPostId(),
-			request.getPage(), request.getTake(), userId);
-
-		return ResponseEntity.status(HttpStatus.OK).body(TempResponseDto.of(commentDtos));
-	}
-
 	@Override
 	@PostMapping("/{commentId}/like")
 	public ResponseEntity<CommentV2SwitchCommentLikeResponseDto> switchCommentLike(

main/src/main/java/org/sopt/makers/crew/main/common/config/CrewDatabaseConfig.java

@@ -0,0 +1,71 @@
+package org.sopt.makers.crew.main.common.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+	basePackages = "org.sopt.makers.crew.main.entity", // 첫번째 DB가 있는 패키지(폴더) 경로
+	entityManagerFactoryRef = "primaryEntityManagerFactory", // EntityManager의 이름
+	transactionManagerRef = "primaryTransactionManager" // 트랜잭션 매니저의 이름
+)
+@Profile({"local", "dev", "prod"})
+public class CrewDatabaseConfig {
+
+	@Bean
+	@Primary
+	@ConfigurationProperties("spring.datasource")
+	public DataSource primaryDatasourceProperties() {
+		return DataSourceBuilder.create().build();
+	}
+
+	@Bean(name = "primaryEntityManagerFactory")
+	@Primary
+	public LocalContainerEntityManagerFactoryBean primaryEntityManagerFactory() {
+		DataSource dataSource = primaryDatasourceProperties();
+
+		LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+		em.setDataSource(dataSource);
+		em.setPackagesToScan("org.sopt.makers.crew.main.entity");
+
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setShowSql(true);
+		em.setJpaVendorAdapter(vendorAdapter);
+
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+		properties.put("hibernate.hbm2ddl.auto", "validate");
+		properties.put("hibernate.format_sql", true);
+		properties.put("hibernate.physical_naming_strategy", "org.sopt.makers.crew.main.common.config.CamelCaseNamingStrategy");
+		properties.put("hibernate.globally_quoted_identifiers", true);
+		em.setJpaPropertyMap(properties);
+
+		return em;
+	}
+
+	@Bean(name = "primaryTransactionManager")
+	@Primary
+	public PlatformTransactionManager primaryTransactionManager(
+		final @Qualifier("primaryEntityManagerFactory") LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean
+	) {
+		return new JpaTransactionManager(Objects.requireNonNull(localContainerEntityManagerFactoryBean.getObject()));
+	}
+}

main/src/main/java/org/sopt/makers/crew/main/common/config/PlaygroundDataSourceConfig.java

@@ -0,0 +1,66 @@
+package org.sopt.makers.crew.main.common.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+	basePackages = "org.sopt.makers.crew.main.external.playground.entity",
+	entityManagerFactoryRef = "secondEntityManagerFactory",
+	transactionManagerRef = "secondTransactionManager"
+)
+@Profile({"local", "dev", "prod"})
+public class PlaygroundDataSourceConfig {
+	@Bean
+	@ConfigurationProperties("spring.playground-datasource")
+	public DataSource secondDatasourceProperties() {
+		return DataSourceBuilder.create().build();
+	}
+
+	@Bean(name = "secondEntityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean secondEntityManagerFactory() {
+		DataSource dataSource = secondDatasourceProperties();
+
+		LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+		em.setDataSource(dataSource);
+		em.setPackagesToScan("org.sopt.makers.crew.main.external.playground.entity");
+
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setShowSql(true);
+		em.setJpaVendorAdapter(vendorAdapter);
+
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+		properties.put("hibernate.hbm2ddl.auto", "validate");
+		properties.put("hibernate.format_sql", true);
+		properties.put("hibernate.physical_naming_strategy", "org.sopt.makers.crew.main.common.config.CamelCaseNamingStrategy");
+		properties.put("hibernate.globally_quoted_identifiers", true);
+		em.setJpaPropertyMap(properties);
+
+		return em;
+	}
+
+	@Bean(name = "secondTransactionManager")
+	public PlatformTransactionManager secondTransactionManager(
+		final @Qualifier("secondEntityManagerFactory") LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean
+	) {
+		return new JpaTransactionManager(Objects.requireNonNull(localContainerEntityManagerFactoryBean.getObject()));
+	}
+}