Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yujin1219 merged 1 commit into from
Sep 23, 2025
Merged

Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
summary = "상품 수정 요청 조회 (관리자)",
description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
@Parameters({
// @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
@Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
@Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
})
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
summary = "상품 수정 요청 거절 (관리자)",
description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
@Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
// @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
@PatchMapping("/{reportId}/reject")
public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
@Parameters({
@Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
})
// @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
@PatchMapping("/{reportId}/accept")
@PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public ApiResponse<ReportResponseDto> acceptReport(
@PathVariable Long reportId,
@Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
@RequestBody(required = false) ImageUpdateRequestDto requestDto) {
return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
@Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
@RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
}

@Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java
View file
Open in desktop

This file was deleted.

31 changes: 24 additions & 7 deletions src/main/java/com/DecodEat/domain/report/service/ReportService.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
private final NutritionReportRepository nutritionReportRepository;
private final ImageReportRepository imageReportRepository;
private final ReportRecordRepository reportRecordRepository;
private final AmazonS3Manager amazonS3Manager;

public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
* @param reportId 수락할 신고의 ID
* @return 처리 결과를 담은 DTO
*/
public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
// 1. ID로 신고 내역 조회
ReportRecord reportRecord = reportRecordRepository.findById(reportId)
.orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

Product product = reportRecord.getProduct();

// 3. 신고 유횽에 따른 로직 분기
// 3. 신고 유형에 따른 로직 분기
if (reportRecord instanceof NutritionReport) {
ProductNutrition productNutrition = product.getProductNutrition();
productNutrition.updateFromReport((NutritionReport) reportRecord);

} else if (reportRecord instanceof ImageReport) {
// 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
// 새로운 이미지가 있는 경우 해당 이미지로 변경
String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
product.updateProductImage(newImageUrl);

String oldImageUrl = product.getProductImage();

// 새로운 이미지가 있는 경우 새로운 이미지로 변경
if(newImageUrl != null && !newImageUrl.isEmpty()) {
String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
product.updateProductImage(uploadedImageUrl);
} else {
// 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
product.updateProductImage(null);
}

if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
amazonS3Manager.deleteFile(oldImageKey);
}
}

// 4. reportstatus 상태를 accepted 변경
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
}

public void deleteFile(String keyName){
try {
amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
log.info("S3 파일 삭제 성공: key={}", keyName);
} catch (Exception e) {
log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
}

}

public String getKeyFromUrl(String fileUrl) {
try {
URL url = new URL(fileUrl);
// URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
return url.getPath().substring(1);
} catch (Exception e) {
log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
throw new RuntimeException("URL parsing error", e);
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경#83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Yujin1219
merged 1 commit into

from

Sep 23, 2025
 Merged


Refactor: 이미지 신고 수락 api를 formdata 방식으로 변경
#83
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 6 additions & 9 deletions
src/main/java/com/DecodEat/domain/report/controller/AdminReportController.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
package com.DecodEat.domain.report.controller;

import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.service.ReportService;
import com.DecodEat.global.apiPayload.ApiResponse;
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.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequiredArgsConstructor
Expand All@@ -26,7 +26,6 @@ public class AdminReportController {
 summary = "상품 수정 요청 조회 (관리자)",
 description = "관리자가 모든 상품 정보 수정 요청을 페이지별로 조회합니다. 영양 정보 수정과 이미지 확인 요청을 모두 포함합니다.")
 @Parameters({
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @Parameter(name = "page", description = "페이지 번호, 0부터 시작합니다.", example = "0"),
 @Parameter(name = "size", description = "한 페이지에 보여줄 항목 수", example = "10")
 })
Expand All@@ -42,7 +41,6 @@ public ApiResponse<ReportResponseDto.ReportListResponseDTO> getReports(
 summary = "상품 수정 요청 거절 (관리자)",
 description = "관리자가 상품 정보 수정 요청을 거절합니다. 해당 신고 내역의 상태를 REJECTED로 변경합니다.")
 @Parameter(name = "reportId", description = "거절할 신고의 ID", example = "1")
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/reject")
 public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId) {
 return ApiResponse.onSuccess(reportService.rejectReport(reportId));
Expand All@@ -57,13 +55,12 @@ public ApiResponse<ReportResponseDto> rejectReport(@PathVariable Long reportId)
 @Parameters({
 @Parameter(name = "reportId", description = "수락할 신고의 ID", example = "1", required = true)
 })
 // @PreAuthorize("hasRole('ADMIN')") // Spring Security 사용 시 권한 설정
 @PatchMapping("/{reportId}/accept")
 @PatchMapping(value = "/{reportId}/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 public ApiResponse<ReportResponseDto> acceptReport(
 @PathVariable Long reportId,
 @Parameter(name = "imageUpdateRequestDto", description = "이미지 신고 시에만 사용. 새 이미지 URL을 제공하여 교체하거나, 본문을 비워 기존 이미지를 삭제합니다.")
 @RequestBody(required = false) ImageUpdateRequestDto requestDto) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, requestDto));
 @Parameter(name = "newImageUrl", description = "이미지 신고 시에만 사용. 교체할 새 이미지 파일을 첨부하거나, 보내지 않으면 기존 이미지가 삭제됩니다.")
 @RequestPart(value = "newImageUrl", required = false) MultipartFile newImageUrl) {
 return ApiResponse.onSuccess(reportService.acceptReport(reportId, newImageUrl));
 }

 @Operation(summary = "신고 상세 조회 API", description = "관리자가 특정 신고 내역의 상세 정보를 조회합니다.")
Expand Down

16 changes: 0 additions & 16 deletions
src/main/java/com/DecodEat/domain/report/dto/request/ImageUpdateRequestDto.java

View file


Open in desktop


This file was deleted.


31 changes: 24 additions & 7 deletions
src/main/java/com/DecodEat/domain/report/service/ReportService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import com.DecodEat.domain.products.entity.ProductNutrition;
import com.DecodEat.domain.products.repository.ProductRepository;
import com.DecodEat.domain.report.converter.ReportConverter;
import com.DecodEat.domain.report.dto.request.ImageUpdateRequestDto;
import com.DecodEat.domain.report.dto.request.ProductNutritionUpdateRequestDto;
import com.DecodEat.domain.report.dto.response.ReportResponseDto;
import com.DecodEat.domain.report.entity.*;
Expand All@@ -14,6 +13,7 @@
import com.DecodEat.domain.report.repository.ReportRecordRepository;
import com.DecodEat.domain.users.entity.User;
import com.DecodEat.global.apiPayload.code.status.ErrorStatus;
import com.DecodEat.global.aws.s3.AmazonS3Manager;
import com.DecodEat.global.exception.GeneralException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand All@@ -22,6 +22,9 @@
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

import static com.DecodEat.global.apiPayload.code.status.ErrorStatus.*;

Expand All@@ -33,6 +36,7 @@ public class ReportService {
 private final NutritionReportRepository nutritionReportRepository;
 private final ImageReportRepository imageReportRepository;
 private final ReportRecordRepository reportRecordRepository;
 private final AmazonS3Manager amazonS3Manager;

 public ReportResponseDto requestUpdateNutrition(User user, Long productId, ProductNutritionUpdateRequestDto requestDto){

Expand DownExpand Up@@ -103,7 +107,7 @@ public ReportResponseDto rejectReport(Long reportId){
 * @param reportId 수락할 신고의 ID
 * @return 처리 결과를 담은 DTO
 */
 public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto requestDto){
 public ReportResponseDto acceptReport(Long reportId, MultipartFile newImageUrl){
 // 1. ID로 신고 내역 조회
 ReportRecord reportRecord = reportRecordRepository.findById(reportId)
 .orElseThrow(() -> new GeneralException(REPORT_NOT_FOUND));
Expand All@@ -115,16 +119,29 @@ public ReportResponseDto acceptReport(Long reportId, ImageUpdateRequestDto reque

 Product product = reportRecord.getProduct();

 // 3. 신고 유횽에 따른 로직 분기
 // 3. 신고 유형에 따른 로직 분기
 if (reportRecord instanceof NutritionReport) {
 ProductNutrition productNutrition = product.getProductNutrition();
 productNutrition.updateFromReport((NutritionReport) reportRecord);

 } else if (reportRecord instanceof ImageReport) {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 // 새로운 이미지가 있는 경우 해당 이미지로 변경
 String newImageUrl = (requestDto != null) ? requestDto.getNewImageUrl() : null;
 product.updateProductImage(newImageUrl);

 String oldImageUrl = product.getProductImage();

 // 새로운 이미지가 있는 경우 새로운 이미지로 변경
 if(newImageUrl != null && !newImageUrl.isEmpty()) {
 String imageKey = "products/" + UUID.randomUUID() + "_" + newImageUrl.getOriginalFilename();
 String uploadedImageUrl = amazonS3Manager.uploadFile(imageKey, newImageUrl);
 product.updateProductImage(uploadedImageUrl);
 } else {
 // 새로운 이미지가 없는 경우 이미지 삭제 -> null로 처리
 product.updateProductImage(null);
 }

 if(oldImageUrl != null && !oldImageUrl.isEmpty()) {
 String oldImageKey = amazonS3Manager.getKeyFromUrl(oldImageUrl);
 amazonS3Manager.deleteFile(oldImageKey);
 }
 }

 // 4. reportstatus 상태를 accepted 변경
Expand Down

23 changes: 23 additions & 0 deletions
src/main/java/com/DecodEat/global/aws/s3/AmazonS3Manager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

import com.DecodEat.global.config.AmazonConfig;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import lombok.RequiredArgsConstructor;
Expand All@@ -10,6 +11,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URL;

@Slf4j
@Component
Expand All@@ -31,4 +33,25 @@ public String uploadFile(String keyName, MultipartFile file){

 return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
 }

 public void deleteFile(String keyName){
 try {
 amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), keyName));
 log.info("S3 파일 삭제 성공: key={}", keyName);
 } catch (Exception e) {
 log.error("S3 파일 삭제 중 에러 발생: key={}", keyName, e);
 }

 }

 public String getKeyFromUrl(String fileUrl) {
 try {
 URL url = new URL(fileUrl);
 // URL 경로에서 맨 앞의 '/'를 제외한 부분이 key가 됨
 return url.getPath().substring(1);
 } catch (Exception e) {
 log.error("URL로부터 S3 key 추출 중 에러 발생: url={}", fileUrl, e);
 throw new RuntimeException("URL parsing error", e);
 }
 }
}
Loading