kgu-clab
diff --git a/‎Dockerfile
Lines changed: 1 addition & 1 deletion b/‎Dockerfile
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md
Lines changed: 1 addition & 1 deletion b/‎README.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎build.gradle
Lines changed: 77 additions & 78 deletions b/‎build.gradle
Lines changed: 77 additions & 78 deletions
diff --git a/‎src/main/java/page/clab/api/ApiApplication.java
Lines changed: 2 additions & 0 deletions b/‎src/main/java/page/clab/api/ApiApplication.java
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/page/clab/api/domain/accuse/api/AccuseController.java
Lines changed: 34 additions & 24 deletions b/‎src/main/java/page/clab/api/domain/accuse/api/AccuseController.java
Lines changed: 34 additions & 24 deletions
@@ -1,4 +1,4 @@
 FROM openjdk:21
 EXPOSE 8080
-COPY build/libs/clab-prod.jar /clab.jar
+COPY build/libs/clab.jar /clab.jar
 ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=stage", "/clab.jar"]
@@ -15,7 +15,7 @@
 - **PostgreSQL**: 주 데이터베이스로 사용.
 - **Redis**: 캐싱 및 JWT 관리를 위해 사용.
 - **Thymeleaf**: 메일 전송을 위한 템플릿 엔진.
-- **GeoIP2**: IP 주소 기반 위치 정보 조회.
+- **IPInfo**: IP 주소 기반 위치 정보 조회.
 - **Google Authenticator**: 2단계 인증을 위한 라이브러리.
 - **Slack API**: 각종 보안 알림을 위해 사용.
 - **Swagger**: API 문서 자동화.
 
@@ -1,113 +1,112 @@
 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"
-	archiveVersion = "1.0.0"
-
-	from("/src/main/resources") {
-		into 'BOOT-INF/classes'
-		duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	}
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-	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'
 }
 
 
 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 'org.modelmapper:modelmapper:3.2.0' // ModelMapper
-	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
-
-	// 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
-	implementation 'com.maxmind.geoip2:geoip2:4.2.0' // GeoIP2
-
-	// 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()
 }
@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
+@EnableJpaAuditing
 public class ApiApplication {
 
     public static void main(String[] args) {
 
@@ -20,12 +20,13 @@
 import page.clab.api.domain.accuse.domain.AccuseStatus;
 import page.clab.api.domain.accuse.domain.TargetType;
 import page.clab.api.domain.accuse.dto.request.AccuseRequestDto;
+import page.clab.api.domain.accuse.dto.response.AccuseMyResponseDto;
 import page.clab.api.domain.accuse.dto.response.AccuseResponseDto;
 import page.clab.api.global.common.dto.PagedResponseDto;
-import page.clab.api.global.common.dto.ResponseModel;
+import page.clab.api.global.common.dto.ApiResponse;
 
 @RestController
-@RequestMapping("/accuses")
+@RequestMapping("/api/v1/accuses")
 @RequiredArgsConstructor
 @Tag(name = "Accuse", description = "신고")
 @Slf4j
@@ -36,44 +37,53 @@ public class AccuseController {
     @Operation(summary = "[U] 신고하기", description = "ROLE_USER 이상의 권한이 필요함")
     @Secured({"ROLE_USER", "ROLE_ADMIN", "ROLE_SUPER"})
     @PostMapping("")
-    public ResponseModel createAccuse(
-            @Valid @RequestBody AccuseRequestDto accuseRequestDto
+    public ApiResponse<Long> createAccuse(
+            @Valid @RequestBody AccuseRequestDto requestDto
     ) {
-        Long id = accuseService.createAccuse(accuseRequestDto);
-        ResponseModel responseModel = ResponseModel.builder().build();
-        responseModel.addData(id);
-        return responseModel;
+        Long id = accuseService.createAccuse(requestDto);
+        return ApiResponse.success(id);
     }
 
     @Operation(summary = "[A] 신고 내역 조회(신고 대상, 처리 상태 기준)", description = "ROLE_ADMIN 이상의 권한이 필요함<br>" +
             "2개의 파라미터를 자유롭게 조합하여 필터링 가능<br>" +
-            "신고 대상, 처리 상태 중 하나라도 입력하지 않으면 전체 조회됨")
+            "신고 대상, 처리 상태 중 하나라도 입력하지 않으면 전체 조회됨<br>" +
+            "누적 횟수 기준으로 정렬할지 여부를 선택할 수 있음")
     @Secured({"ROLE_ADMIN", "ROLE_SUPER"})
     @GetMapping("")
-    public ResponseModel getAccusesByConditions(
-            @RequestParam(name = "targetType", required = false) TargetType targetType,
-            @RequestParam(name = "accuseStatus", required = false) AccuseStatus accuseStatus,
+    public ApiResponse<PagedResponseDto<AccuseResponseDto>> getAccusesByConditions(
+            @RequestParam(name = "targetType", required = false) TargetType type,
+            @RequestParam(name = "accuseStatus", required = false) AccuseStatus status,
+            @RequestParam(name = "countOrder", defaultValue = "false") boolean countOrder,
             @RequestParam(name = "page", defaultValue = "0") int page,
             @RequestParam(name = "size", defaultValue = "20") int size
     ) {
         Pageable pageable = PageRequest.of(page, size);
-        PagedResponseDto<AccuseResponseDto> accuses = accuseService.getAccusesByConditions(targetType, accuseStatus, pageable);
-        ResponseModel responseModel = ResponseModel.builder().build();
-        responseModel.addData(accuses);
-        return responseModel;
+        PagedResponseDto<AccuseResponseDto> accuses = accuseService.getAccusesByConditions(type, status, countOrder, pageable);
+        return ApiResponse.success(accuses);
+    }
+
+    @Operation(summary = "[U] 나의 신고 내역 조회", description = "ROLE_USER 이상의 권한이 필요함")
+    @Secured({"ROLE_USER", "ROLE_ADMIN", "ROLE_SUPER"})
+    @GetMapping("/my")
+    public ApiResponse<PagedResponseDto<AccuseMyResponseDto>> getMyAccuses(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "20") int size
+    ) {
+        Pageable pageable = PageRequest.of(page, size);
+        PagedResponseDto<AccuseMyResponseDto> accuses = accuseService.getMyAccuses(pageable);
+        return ApiResponse.success(accuses);
     }
 
     @Operation(summary = "[A] 신고 상태 변경", description = "ROLE_ADMIN 이상의 권한이 필요함")
     @Secured({"ROLE_ADMIN", "ROLE_SUPER"})
-    @PatchMapping("/{accuseId}")
-    public ResponseModel updateAccuseStatus(
-            @PathVariable(name = "accuseId") Long accuseId,
-            @RequestParam(name = "accuseStatus") AccuseStatus accuseStatus
+    @PatchMapping("/{targetType}/{targetId}")
+    public ApiResponse<Long> updateAccuseStatus(
+            @PathVariable(name = "targetType") TargetType type,
+            @PathVariable(name = "targetId") Long targetId,
+            @RequestParam(name = "accuseStatus") AccuseStatus status
     ) {
-        Long id = accuseService.updateAccuseStatus(accuseId, accuseStatus);
-        ResponseModel responseModel = ResponseModel.builder().build();
-        responseModel.addData(id);
-        return responseModel;
+        Long id = accuseService.updateAccuseStatus(type, targetId, status);
+        return ApiResponse.success(id);
     }
 
 }