Feat/entity delete

build.gradle

@@ -1,111 +1,111 @@
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.2.1'
-	id 'io.spring.dependency-management' version '1.1.4'
+    id 'java'
+    id 'org.springframework.boot' version '3.2.1'
+    id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'page.clab'
 version = '0.0.1-SNAPSHOT'
 
 jar {
-	enabled = false
+    enabled = false
 }
 
 bootJar {
-	archivesBaseName = "clab"
-	archiveFileName = "clab.jar"
-	archiveVersion = "1.0.0"
-
-	if (project.hasProperty('prod')) {
-		archiveFileName = "clab-prod.jar"
-	} else if (project.hasProperty('stage')) {
-		archiveFileName = "clab-stage.jar"
-	} else {
-		archiveFileName = "clab.jar"
-	}
+    archivesBaseName = "clab"
+    archiveFileName = "clab.jar"
+    archiveVersion = "1.0.0"
+
+    if (project.hasProperty('prod')) {
+        archiveFileName = "clab-prod.jar"
+    } else if (project.hasProperty('stage')) {
+        archiveFileName = "clab-stage.jar"
+    } else {
+        archiveFileName = "clab.jar"
+    }
 }
 
 test {
-	systemProperty 'spring.profiles.active', findProperty('env') ?: 'dev'
+    systemProperty 'spring.profiles.active', findProperty('env') ?: 'dev'
 }
 
 java {
-	sourceCompatibility = '21'
+    sourceCompatibility = '21'
 }
 
 repositories {
-	mavenCentral()
-	maven { url 'https://jitpack.io' }
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-	// Spring Project
-	implementation 'org.springframework.boot:spring-boot-starter-actuator' // 모니터링
-	implementation 'org.springframework.boot:spring-boot-starter-web' // 웹 MVC
-	implementation 'org.springframework.boot:spring-boot-starter-validation' // 유효성 검사
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' // 템플릿 엔진
-	implementation 'org.springframework.boot:spring-boot-starter-webflux' // WebFlux
-	developmentOnly 'org.springframework.boot:spring-boot-devtools' // 개발 도구
-
-	// Util
-	compileOnly 'org.projectlombok:lombok' // 롬복
-	annotationProcessor 'org.projectlombok:lombok' // 롬복
-	implementation 'com.google.code.gson:gson:2.10.1' // JSON 라이브러리
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' // Swagger
-	implementation 'commons-io:commons-io:2.15.1' // Apache Commons IO
-	implementation 'com.google.guava:guava:33.0.0-jre' // Google Core Libraries For Java
-	implementation 'org.springframework.boot:spring-boot-starter-mail' // Spring Mail
-	implementation 'com.google.zxing:core:3.4.1' // QR 코드
-	implementation 'com.google.zxing:javase:3.4.1' // QR 코드
-	implementation 'com.slack.api:slack-api-client:1.38.0' // Slack API
-	implementation 'io.ipinfo:ipinfo-spring:0.3.1' // IPInfo
-
-
-	// DB
-	implementation 'org.postgresql:postgresql:42.7.1' // PostgreSQL JDBC Driver
-	implementation 'org.springframework.boot:spring-boot-starter-data-redis' // Redis
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Spring Data JPA
-	implementation 'org.springframework.boot:spring-boot-starter-validation' // Hibernate Validator
-	implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final' // Bean Validation
-	implementation 'jakarta.validation:jakarta.validation-api:3.0.2' // Jakarta Bean Validation
-
-	// QueryDSL
-	implementation 'com.querydsl:querydsl-jpa:5.1.0:jakarta'
-	annotationProcessor "com.querydsl:querydsl-apt:5.1.0:jakarta"
-	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
-
-	// Security
-	implementation 'org.springframework.boot:spring-boot-starter-security' // Spring Security
-	implementation 'com.warrenstrange:googleauth:1.5.0' // Google Authenticator
-	implementation 'io.jsonwebtoken:jjwt-api:0.11.5' // JWT 라이브러리
-	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' // JWT 구현체
-	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' // JWT Jackson 모듈
-
-	// XSS Filter
-	implementation 'com.navercorp.lucy:lucy-xss-servlet:2.0.1' // Lucy XSS Servlet Filter
-	implementation 'com.navercorp.lucy:lucy-xss:1.6.3' // Lucy XSS Filter
-	implementation 'org.apache.commons:commons-text:1.11.0' // Apache Commons Text
-
-	// Test
-	testImplementation 'org.springframework.boot:spring-boot-starter-test' // Spring Boot Test
-	testImplementation 'org.springframework.security:spring-security-test' // Spring Security Test
+    // Spring Project
+    implementation 'org.springframework.boot:spring-boot-starter-actuator' // 모니터링
+    implementation 'org.springframework.boot:spring-boot-starter-web' // 웹 MVC
+    implementation 'org.springframework.boot:spring-boot-starter-validation' // 유효성 검사
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' // 템플릿 엔진
+    implementation 'org.springframework.boot:spring-boot-starter-webflux' // WebFlux
+    developmentOnly 'org.springframework.boot:spring-boot-devtools' // 개발 도구
+
+    // Util
+    compileOnly 'org.projectlombok:lombok' // 롬복
+    annotationProcessor 'org.projectlombok:lombok' // 롬복
+    implementation 'com.google.code.gson:gson:2.10.1' // JSON 라이브러리
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' // Swagger
+    implementation 'commons-io:commons-io:2.15.1' // Apache Commons IO
+    implementation 'com.google.guava:guava:33.0.0-jre' // Google Core Libraries For Java
+    implementation 'org.springframework.boot:spring-boot-starter-mail' // Spring Mail
+    implementation 'com.google.zxing:core:3.4.1' // QR 코드
+    implementation 'com.google.zxing:javase:3.4.1' // QR 코드
+    implementation 'com.slack.api:slack-api-client:1.38.0' // Slack API
+    implementation 'io.ipinfo:ipinfo-spring:0.3.1' // IPInfo
+
+
+    // DB
+    implementation 'org.postgresql:postgresql:42.7.1' // PostgreSQL JDBC Driver
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis' // Redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Spring Data JPA
+    implementation 'org.springframework.boot:spring-boot-starter-validation' // Hibernate Validator
+    implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final' // Bean Validation
+    implementation 'jakarta.validation:jakarta.validation-api:3.0.2' // Jakarta Bean Validation
+
+    // QueryDSL
+    implementation 'com.querydsl:querydsl-jpa:5.1.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:5.1.0:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    // Security
+    implementation 'org.springframework.boot:spring-boot-starter-security' // Spring Security
+    implementation 'com.warrenstrange:googleauth:1.5.0' // Google Authenticator
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5' // JWT 라이브러리
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' // JWT 구현체
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' // JWT Jackson 모듈
+
+    // XSS Filter
+    implementation 'com.navercorp.lucy:lucy-xss-servlet:2.0.1' // Lucy XSS Servlet Filter
+    implementation 'com.navercorp.lucy:lucy-xss:1.6.3' // Lucy XSS Filter
+    implementation 'org.apache.commons:commons-text:1.11.0' // Apache Commons Text
+
+    // Test
+    testImplementation 'org.springframework.boot:spring-boot-starter-test' // Spring Boot Test
+    testImplementation 'org.springframework.security:spring-security-test' // Spring Security Test
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 def querydslDir = "$buildDir/generated/querydsl"
 
 sourceSets {
-	main.java.srcDirs += [ querydslDir ]
+    main.java.srcDirs += [ querydslDir ]
 }
 
 tasks.withType(JavaCompile) {
-	options.generatedSourceOutputDirectory = file(querydslDir)
+    options.generatedSourceOutputDirectory = file(querydslDir)
 }
 
 clean.doLast {
-	file(querydslDir).deleteDir()
+    file(querydslDir).deleteDir()
 }

docker-compose.yml

@@ -0,0 +1,52 @@
+version: '3.8'
+
+services:
+  postgresql:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_DB: postgres
+      POSTGRES_USER: clab
+      POSTGRES_PASSWORD: clab@1362!
+    ports:
+      - "4000:5432"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+
+  redis:
+    image: redis
+    restart: always
+    command: redis-server --requirepass clab@redis1362!
+    ports:
+      - "4001:6379"
+    volumes:
+      - redis-data:/data
+
+  jenkins:
+    image: jenkins/jenkins:lts
+    user: root
+    restart: always
+    ports:
+      - "5010:8080"
+      - "5000:5000"
+    volumes:
+      - jenkins-data:/var/jenkins_home
+
+  openjdk21:
+    image: openjdk:21-jdk
+    command: "/bin/bash"
+    volumes:
+      - /var/jenkins_home/workspace/clab-server:/app
+
+  goofy_perlman:
+    image: openjdk:21-jdk
+    command: "/bin/bash"
+
+volumes:
+  postgres-data:
+  redis-data:
+  jenkins-data:
+
+networks:
+  default:
+    driver: bridge

src/main/java/page/clab/api/domain/activityGroup/api/ActivityGroupAdminController.java

@@ -24,6 +24,8 @@
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupRequestDto;
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupUpdateRequestDto;
 import page.clab.api.domain.activityGroup.dto.response.ActivityGroupMemberWithApplyReasonResponseDto;
+import page.clab.api.domain.activityGroup.dto.response.ActivityGroupResponseDto;
+import page.clab.api.domain.award.dto.response.AwardResponseDto;
 import page.clab.api.global.common.dto.PagedResponseDto;
 import page.clab.api.global.common.dto.ApiResponse;
 import page.clab.api.global.exception.PermissionDeniedException;
@@ -130,4 +132,16 @@ public ApiResponse<String> acceptGroupMember(
         return ApiResponse.success(id);
     }
 
+    @GetMapping("/deleted")
+    @Operation(summary = "[S] 삭제된 활동그룹 조회하기", description = "ROLE_SUPER 이상의 권한이 필요함")
+    @Secured({"ROLE_SUPER"})
+    public ApiResponse<PagedResponseDto<ActivityGroupResponseDto>> getDeletedActivityGroups(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "20") int size
+    ) {
+        Pageable pageable = PageRequest.of(page, size);
+        PagedResponseDto<ActivityGroupResponseDto> activityGroups = activityGroupAdminService.getDeletedActivityGroups(pageable);
+        return ApiResponse.success(activityGroups);
+    }
+
 }

src/main/java/page/clab/api/domain/activityGroup/api/ActivityGroupBoardController.java

@@ -24,6 +24,7 @@
 import page.clab.api.domain.activityGroup.dto.response.ActivityGroupBoardResponseDto;
 import page.clab.api.domain.activityGroup.dto.response.ActivityGroupBoardUpdateResponseDto;
 import page.clab.api.domain.activityGroup.dto.response.AssignmentSubmissionWithFeedbackResponseDto;
+import page.clab.api.domain.award.dto.response.AwardResponseDto;
 import page.clab.api.global.common.dto.PagedResponseDto;
 import page.clab.api.global.common.dto.ApiResponse;
 import page.clab.api.global.exception.PermissionDeniedException;
@@ -137,4 +138,16 @@ public ApiResponse<Long> deleteActivityGroupBoard(
         return ApiResponse.success(id);
     }
 
+    @GetMapping("/deleted")
+    @Operation(summary = "[S] 삭제된 활동 그룹 게시판 조회하기", description = "ROLE_SUPER 이상의 권한이 필요함")
+    @Secured({"ROLE_SUPER"})
+    public ApiResponse<PagedResponseDto<ActivityGroupBoardResponseDto>> getDeletedActivityGroupBoards(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "20") int size
+    ) {
+        Pageable pageable = PageRequest.of(page, size);
+        PagedResponseDto<ActivityGroupBoardResponseDto> activityBoards = activityGroupBoardService.getDeletedActivityGroupBoards(pageable);
+        return ApiResponse.success(activityBoards);
+    }
+
 }

src/main/java/page/clab/api/domain/activityGroup/api/ActivityGroupReportController.java

@@ -21,8 +21,8 @@
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupReportRequestDto;
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupReportUpdateRequestDto;
 import page.clab.api.domain.activityGroup.dto.response.ActivityGroupReportResponseDto;
-import page.clab.api.global.common.dto.PagedResponseDto;
 import page.clab.api.global.common.dto.ApiResponse;
+import page.clab.api.global.common.dto.PagedResponseDto;
 import page.clab.api.global.exception.PermissionDeniedException;
 
 @RestController
@@ -90,4 +90,17 @@ public ApiResponse<Long> deleteAward(
         return ApiResponse.success(id);
     }
 
+
+    @GetMapping("/deleted")
+    @Operation(summary = "[S] 삭제된 활동보고서 조회하기", description = "ROLE_SUPER 이상의 권한이 필요함")
+    @Secured({"ROLE_SUPER"})
+    public ApiResponse<PagedResponseDto<ActivityGroupReportResponseDto>> getDeletedActivityGroupReports(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "20") int size
+    ) {
+        Pageable pageable = PageRequest.of(page, size);
+        PagedResponseDto<ActivityGroupReportResponseDto> activityGroupReports = activityGroupReportService.getDeletedActivityGroupReports(pageable);
+        return ApiResponse.success(activityGroupReports);
+    }
+
 }

src/main/java/page/clab/api/domain/activityGroup/application/ActivityGroupAdminService.java

@@ -20,6 +20,7 @@
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupRequestDto;
 import page.clab.api.domain.activityGroup.dto.request.ActivityGroupUpdateRequestDto;
 import page.clab.api.domain.activityGroup.dto.response.ActivityGroupMemberWithApplyReasonResponseDto;
+import page.clab.api.domain.activityGroup.dto.response.ActivityGroupResponseDto;
 import page.clab.api.domain.member.application.MemberService;
 import page.clab.api.domain.member.domain.Member;
 import page.clab.api.domain.notification.application.NotificationService;
@@ -91,11 +92,17 @@ public Long manageActivityGroup(Long activityGroupId, ActivityGroupStatus status
         return activityGroup.getId();
     }
 
+    @Transactional(readOnly = true)
+    public PagedResponseDto<ActivityGroupResponseDto> getDeletedActivityGroups(Pageable pageable) {
+        Page<ActivityGroup> activityGroups = activityGroupRepository.findAllByIsDeletedTrue(pageable);
+        return new PagedResponseDto<>(activityGroups.map(ActivityGroupResponseDto::toDto));
+    }
+
     @Transactional
     public Long deleteActivityGroup(Long activityGroupId) {
+        ActivityGroup activityGroup = getActivityGroupByIdOrThrow(activityGroupId);
         List<GroupMember> groupMembers = activityGroupMemberService.getGroupMemberByActivityGroupId(activityGroupId);
         List<GroupSchedule> groupSchedules = groupScheduleRepository.findAllByActivityGroupIdOrderByIdDesc(activityGroupId);
-        ActivityGroup activityGroup = getActivityGroupByIdOrThrow(activityGroupId);
         GroupMember groupLeader = activityGroupMemberService.getGroupMemberByActivityGroupIdAndRole(activityGroupId, ActivityGroupRole.LEADER);
 
         activityGroupMemberService.deleteAll(groupMembers);

src/main/java/page/clab/api/domain/activityGroup/application/ActivityGroupBoardService.java

@@ -21,6 +21,8 @@
 import page.clab.api.domain.activityGroup.dto.response.AssignmentSubmissionWithFeedbackResponseDto;
 import page.clab.api.domain.activityGroup.dto.response.FeedbackResponseDto;
 import page.clab.api.domain.activityGroup.exception.InvalidParentBoardException;
+import page.clab.api.domain.award.domain.Award;
+import page.clab.api.domain.award.dto.response.AwardResponseDto;
 import page.clab.api.domain.member.application.MemberService;
 import page.clab.api.domain.member.domain.Member;
 import page.clab.api.domain.notification.application.NotificationService;
@@ -145,6 +147,12 @@ public Long deleteActivityGroupBoard(Long activityGroupBoardId) throws Permissio
         return board.getId();
     }
 
+    @Transactional(readOnly = true)
+    public PagedResponseDto<ActivityGroupBoardResponseDto> getDeletedActivityGroupBoards(Pageable pageable) {
+        Page<ActivityGroupBoard> activityGroupBoards = activityGroupBoardRepository.findAllByIsDeletedTrue(pageable);
+        return new PagedResponseDto<>(activityGroupBoards.map(ActivityGroupBoardResponseDto::toDto));
+    }
+
     private ActivityGroupBoard getActivityGroupBoardByIdOrThrow(Long activityGroupBoardId) {
         return activityGroupBoardRepository.findById(activityGroupBoardId)
                 .orElseThrow(() -> new NotFoundException("해당 게시글을 찾을 수 없습니다."));

src/main/java/page/clab/api/domain/activityGroup/application/ActivityGroupReportService.java

@@ -75,6 +75,12 @@ public Long deleteReport(Long reportId) throws PermissionDeniedException {
         return report.getId();
     }
 
+    @Transactional(readOnly = true)
+    public PagedResponseDto<ActivityGroupReportResponseDto> getDeletedActivityGroupReports(Pageable pageable) {
+        Page<ActivityGroupReport> activityGroupReports = activityGroupReportRepository.findAllByIsDeletedTrue(pageable);
+        return new PagedResponseDto<>(activityGroupReports.map(ActivityGroupReportResponseDto::toDto));
+    }
+
     public ActivityGroupReport getReportByIdOrThrow(Long reportId) {
         return activityGroupReportRepository.findById(reportId)
                 .orElseThrow(() -> new NotFoundException("활동 보고서를 찾을 수 없습니다."));

src/main/java/page/clab/api/domain/activityGroup/dao/ActivityGroupBoardRepository.java

@@ -3,6 +3,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 import page.clab.api.domain.activityGroup.domain.ActivityGroupBoard;
@@ -21,4 +22,7 @@ public interface ActivityGroupBoardRepository extends JpaRepository<ActivityGrou
 
     List<ActivityGroupBoard> findAllChildrenByParentId(Long activityGroupBoardId);
 
+    @Query(value = "SELECT a.* FROM activity_group_board a WHERE a.is_deleted = true", nativeQuery = true)
+    Page<ActivityGroupBoard> findAllByIsDeletedTrue(Pageable pageable);
+
 }