v1.1.0

.github/workflows/aws-cicd-dev.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - feat/LA-20_3
 
 env:
   REGISTRY: "docker.io"
@@ -56,6 +57,7 @@ jobs:
         run: |
           echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-api/src/main/resources/application-secret.properties
           echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-batch/src/main/resources/application-secret.properties
+          echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-admin/src/main/resources/application-secret.properties
 
       - name: Build layer-api module
         run: ./gradlew :layer-api:build
@@ -69,6 +71,12 @@ jobs:
       - name: Test layer-batch module
         run: ./gradlew :layer-batch:test
 
+      - name: Build layer-admin module
+        run: ./gradlew :layer-admin:build
+
+      - name: Test layer-admin module
+        run: ./gradlew :layer-admin:test
+
       - name: Docker Hub Login
         uses: docker/login-action@v1
         with:
@@ -82,6 +90,7 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-api
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-batch
+            ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-admin
 
       - name: Push layer-api Docker Image
         uses: docker/build-push-action@v4
@@ -104,6 +113,16 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-batch:latest
 
+      - name: Push layer-admin Docker Image
+        uses: docker/build-push-action@v4
+        with:
+          context: ./layer-admin
+          file: ./layer-admin/Dockerfile-admin # Dockerfile 이름 지정
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-admin:latest
+
   deploy:
     name: Deploy
     needs: [ build, setup ]
@@ -119,6 +138,7 @@ jobs:
         run: |
           echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-api/infra/${{ env.DEPLOY_TARGET }}/application-secret.properties
           echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-batch/src/main/resources/application-secret.properties
+          echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-admin/src/main/resources/application-secret.properties
 
       - name: Archive Files
         run: |

.github/workflows/aws-cicd-prod.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - chore/migration
 
 env:
   REGISTRY: "docker.io"
@@ -57,6 +56,7 @@ jobs:
         run: |
           echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-api/src/main/resources/application-secret.properties
           echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-batch/src/main/resources/application-secret.properties
+          echo "${APPLICATION_SECRET_PROPERTIES}" > ./layer-admin/src/main/resources/application-secret.properties      
 
       - name: Build layer-api module
         run: ./gradlew :layer-api:build
@@ -70,6 +70,12 @@ jobs:
       - name: Test layer-batch module
         run: ./gradlew :layer-batch:test
 
+      - name: Build layer-admin module
+        run: ./gradlew :layer-admin:build
+
+      - name: Test layer-admin module
+        run: ./gradlew :layer-admin:test
+
       - name: Docker Hub Login
         uses: docker/login-action@v1
         with:
@@ -83,6 +89,7 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-api
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-batch
+            ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-admin      
 
       - name: Push layer-api Docker Image
         uses: docker/build-push-action@v4
@@ -106,6 +113,16 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-batch:latest
           no-cache: true
 
+      - name: Push layer-admin Docker Image
+        uses: docker/build-push-action@v4
+        with:
+          context: ./layer-admin
+          file: ./layer-admin/Dockerfile-admin # Dockerfile 이름 지정
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}_layer-admin:latest
+
   deploy:
     name: Deploy
     needs: [ build, setup ]
@@ -121,6 +138,7 @@ jobs:
         run: |
           echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-api/infra/${{ env.DEPLOY_TARGET }}/application-secret.properties
           echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-batch/src/main/resources/application-secret.properties
+          echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./layer-admin/src/main/resources/application-secret.properties
 
       - name: Archive Files
         run: |

.gitignore

@@ -57,4 +57,5 @@ credentials.json
 
 
 layer-api/src/main/resources/tokens/StoredCredential
-layer-batch/src/main/resources/application-secret.properties
+layer-batch/src/main/resources/application-secret.properties
+layer-admin/src/main/resources/application-secret.properties

build.gradle

@@ -66,7 +66,6 @@ project(":layer-api") {
         implementation project(path: ':layer-domain')
         implementation project(path: ':layer-external')
 
-
         implementation 'org.springframework.boot:spring-boot-starter-actuator'
         implementation 'org.springframework.boot:spring-boot-starter-validation'
 
@@ -82,7 +81,6 @@ project(":layer-api") {
         implementation 'org.springframework.boot:spring-boot-starter-data-redis'
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
-
         // openfeign
         implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.1.2")
 
@@ -195,4 +193,24 @@ project(":layer-batch") {
         runtimeOnly 'com.mysql:mysql-connector-j'
     }
 
+}
+
+project(":layer-admin") {
+    jar.enabled = false
+    bootJar.enabled = true
+
+    dependencies {
+        implementation project(path: ':layer-domain')
+
+        implementation 'org.springframework.boot:spring-boot-starter-web'
+        implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+        runtimeOnly 'com.mysql:mysql-connector-j'
+
+        // swagger
+        implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
+
+        // Security
+        implementation 'org.springframework.boot:spring-boot-starter-security'
+    }
+
 }

layer-admin/Dockerfile-admin

@@ -0,0 +1,10 @@
+FROM openjdk:17
+
+ARG JAR_FILE=./build/libs/*.jar
+ARG SPRING_PROFILE
+
+COPY ${JAR_FILE} layer-admin.jar
+
+ENV SPRING_PROFILE=${SPRING_PROFILE}
+
+ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul" ,"-jar" ,"layer-admin.jar"]

layer-admin/src/main/java/org/layer/AdminApplication.java

@@ -0,0 +1,14 @@
+package org.layer;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@SpringBootApplication
+@EnableJpaAuditing
+public class AdminApplication {
+	public static void main(String[] args) {
+		SpringApplication.run(AdminApplication.class, args);
+	}
+
+}

layer-admin/src/main/java/org/layer/config/SecurityConfig.java

@@ -0,0 +1,23 @@
+package org.layer.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+		http
+			.csrf(AbstractHttpConfigurer::disable) // CSRF 비활성화
+			.authorizeHttpRequests(auth -> auth
+				.anyRequest().permitAll() // 모든 요청 허용
+			)
+			.httpBasic(AbstractHttpConfigurer::disable); // HTTP Basic 인증 비활성화
+
+		return http.build();
+	}
+}

layer-admin/src/main/java/org/layer/member/controller/AdminMemberApi.java

@@ -0,0 +1,26 @@
+package org.layer.member.controller;
+
+import org.layer.member.controller.dto.GetMembersActivitiesResponse;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = "[ADMIN] 회원 서비스", description = "회원 관련 api")
+public interface AdminMemberApi {
+
+	@Operation(summary = "회원 활동 목록 조회")
+	@Parameters({
+		@Parameter(name = "password", description = "패스워드", example = "abcdef", required = true),
+		@Parameter(name = "page", description = "페이지 수, 최솟값 1", example = "1", required = true),
+		@Parameter(name = "take", description = "가져올 데이터 수", example = "20", required = true)
+	})
+	ResponseEntity<GetMembersActivitiesResponse> getMemberActivities(
+		@RequestParam String password,
+		@RequestParam int page,
+		@RequestParam int take);
+
+}

layer-admin/src/main/java/org/layer/member/controller/AdminMemberController.java

@@ -0,0 +1,29 @@
+package org.layer.member.controller;
+
+import org.layer.member.controller.dto.GetMembersActivitiesResponse;
+import org.layer.member.service.AdminMemberService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RequestMapping("/members")
+@RequiredArgsConstructor
+@RestController
+public class AdminMemberController implements AdminMemberApi {
+	private final AdminMemberService adminMemberService;
+
+	@Override
+	@GetMapping
+	public ResponseEntity<GetMembersActivitiesResponse> getMemberActivities(
+		@RequestParam String password,
+		@RequestParam(defaultValue = "1") int page,
+		@RequestParam(defaultValue = "20") int take) {
+
+		return ResponseEntity.ok().body(adminMemberService.getMemberActivities(password, page, take));
+	}
+
+}

layer-admin/src/main/java/org/layer/member/controller/dto/GetMemberActivityResponse.java

@@ -0,0 +1,29 @@
+package org.layer.member.controller.dto;
+
+import java.time.LocalDateTime;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+@Schema(name = "GetMemberActivityResponse", description = "회원 활동 Dto")
+public record GetMemberActivityResponse(
+	@NotNull
+	@Schema(description = "회원 이름", example = "홍길동")
+	String name,
+	@NotNull
+	@Schema(description = "최근 활동 날짜", example = "2024-11-30T16:21:47.031Z")
+	LocalDateTime recentActivityDate,
+	@NotNull
+	@Schema(description = "소속된 스페이스 수", example = "7")
+	long spaceCount,
+	@NotNull
+	@Schema(description = "작성한 회고 수", example = "15")
+	long retrospectAnswerCount,
+	@NotNull
+	@Schema(description = "회원가입 날짜", example = "2024-10-30T16:21:47.031Z")
+	LocalDateTime signUpDate,
+	@NotNull
+	@Schema(description = "회원가입 플랫폼", example = "KAKAO")
+	String socialType
+) {
+}

layer-admin/src/main/java/org/layer/member/controller/dto/GetMembersActivitiesResponse.java

@@ -0,0 +1,15 @@
+package org.layer.member.controller.dto;
+
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+@Schema(name = "GetMembersActivitiesResponse", description = "회원 활동 목록 Dto")
+public record GetMembersActivitiesResponse(
+	@NotNull
+	@Schema(description = "회원 활동 목록", example = "")
+	List<GetMemberActivityResponse> responses
+
+) {
+}

layer-admin/src/main/java/org/layer/member/service/AdminMemberService.java

@@ -0,0 +1,52 @@
+package org.layer.member.service;
+
+import java.util.List;
+
+import org.layer.domain.answer.repository.AdminAnswerRepository;
+import org.layer.domain.member.entity.Member;
+import org.layer.domain.member.repository.AdminMemberRepository;
+import org.layer.domain.space.repository.AdminMemberSpaceRelationRepository;
+import org.layer.member.controller.dto.GetMemberActivityResponse;
+import org.layer.member.controller.dto.GetMembersActivitiesResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AdminMemberService {
+	private final AdminMemberRepository adminMemberRepository;
+	private final AdminMemberSpaceRelationRepository adminMemberSpaceRelationRepository;
+	private final AdminAnswerRepository adminAnswerRepository;
+
+	@Value("${admin.password}")
+	private String password;
+
+	public GetMembersActivitiesResponse getMemberActivities(String password, int page, int take) {
+
+		// TODO: 검증 로직 필터단으로 옮기기
+		if (!password.equals(this.password)) {
+			throw new IllegalArgumentException("비밀번호가 올바르지 않습니다.");
+		}
+
+		PageRequest pageRequest = PageRequest.of(page - 1, take);
+		Page<Member> members = adminMemberRepository.findAll(pageRequest);
+
+		List<GetMemberActivityResponse> responses = members.getContent().stream()
+			.map(member -> {
+
+				Long spaceCount = adminMemberSpaceRelationRepository.countAllByMemberId(member.getId());
+				Long retrospectAnswerCount = adminAnswerRepository.countAllByMemberId(member.getId());
+
+				return new GetMemberActivityResponse(member.getName(), null, spaceCount, retrospectAnswerCount,
+					member.getCreatedAt(), member.getSocialType().name());
+			}).toList();
+
+		return new GetMembersActivitiesResponse(responses);
+	}
+}