Skip to content

hotfix: 참조 중인 스타일 이미지 삭제 방지 #160

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
hoshino-love0102 merged 2 commits into from
Sep 3, 2026
Merged

hotfix: 참조 중인 스타일 이미지 삭제 방지 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b64bd7
fix: 참조 중인 파일을 정리 대상에서 제외
hoshino-love0102 Sep 3, 2026
f0bed53
test: READY 파일 참조별 정리 회귀 검증 추가
hoshino-love0102 Sep 3, 2026
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
21 changes: 17 additions & 4 deletions src/main/java/com/heddy/adapter/out/persistence/file/FileJpaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ List<FileEntity> findReclaimTargets(

/**
* READY 고아 판정 분기다. 네이티브 SQL 은 바인드 파라미터로 테이블 이름을 받을 수 없어,
* "파일을 참조하는 테이블" 목록이 이 상수 안에 하드코딩된다. 현재 READY 파일을 참조하는
* 도메인은 시술기록 사진({@code treatment_record_photos}) 하나뿐이다. 새 도메인이 READY
* 파일을 참조하게 되면 여기에 조건을 덧대지 않으면 그 도메인이 붙인 파일까지 고아로
* 판정돼 사진이 통째로 정리된다 — 파일 참조 기능을 추가할 때는 반드시 이 상수를 함께 고친다.
* "파일을 참조하는 테이블" 목록이 이 상수 안에 하드코딩된다. 새 도메인이 READY 파일을
* 참조하게 되면 여기에 조건을 덧대지 않을 경우 사용 중인 파일까지 고아로 오판해 스토리지
* 객체를 지운다. 파일 참조 기능을 추가할 때는 반드시 이 상수를 함께 고친다.
*/
String READY_ORPHAN_CLAUSE = """
OR (
Expand All @@ -93,6 +92,20 @@ AND NOT EXISTS (
SELECT 1 FROM treatment_record_photos photo
WHERE photo.file_id = f.file_id
)
AND NOT EXISTS (
SELECT 1 FROM analysis_overlays overlay
WHERE overlay.file_id = f.file_id
)
AND NOT EXISTS (
SELECT 1 FROM hairstyle_assets hairstyle
WHERE hairstyle.thumbnail_file_id = f.file_id
OR hairstyle.base_file_id = f.file_id
OR hairstyle.mask_file_id = f.file_id
)
AND NOT EXISTS (
SELECT 1 FROM saved_styles saved_style
WHERE saved_style.capture_id = f.file_id
)
)""";

/**
Expand Down
112 changes: 112 additions & 0 deletions ...st/java/com/heddy/adapter/out/persistence/file/FilePersistenceAdapterIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.heddy.domain.file.exception.FileException;
import com.heddy.domain.file.model.FilePurpose;
import com.heddy.domain.file.model.FileStatus;
import com.heddy.domain.file.model.StorageObject;
import com.heddy.domain.file.model.StoredFile;
import com.heddy.domain.file.model.VerifiedContent;
import com.heddy.support.PostgresIntegrationTest;
Expand Down Expand Up @@ -247,6 +248,87 @@ void findsExpiredPendingUnlinkedReadyAndExpiredDeletedCleanupCandidates() {
.doesNotContain(freshPending.fileId(), freshDeleted.fileId());
}

/**
* READY 고아 판정은 파일을 직접 참조하는 모든 테이블을 알아야 한다. 참조 누락은 DB 행은
* READY 로 남긴 채 스토리지 객체만 먼저 지우므로, API 가 발급한 정상 서명 URL이
* {@code NoSuchKey} 로 깨지는 운영 장애가 된다.
*/
@Test
void excludesEveryReferencedReadyFileFromCleanupCandidates() {
Instant now = Instant.now();
StoredFile treatmentPhoto = oldReadyUserFile(
"referenced-treatment.jpg", FilePurpose.TREATMENT_PHOTO, "image/jpeg", now);
StoredFile analysisOverlay = oldReadySystemFile(
"referenced-overlay.png", FilePurpose.ANALYSIS_OVERLAY_INTERNAL, "image/png", now);
StoredFile thumbnail = oldReadySystemFile(
"referenced-thumbnail.jpg", FilePurpose.HAIRSTYLE_THUMBNAIL, "image/jpeg", now);
StoredFile arBase = oldReadySystemFile(
"referenced-ar-base.png", FilePurpose.HAIRSTYLE_AR_BASE, "image/png", now);
StoredFile arMask = oldReadySystemFile(
"referenced-ar-mask.png", FilePurpose.HAIRSTYLE_AR_MASK, "image/png", now);
StoredFile savedCapture = oldReadyUserFile(
"referenced-capture.jpg", FilePurpose.AR_CAPTURE, "image/jpeg", now);
StoredFile orphan = oldReadyUserFile(
"unreferenced.jpg", FilePurpose.TREATMENT_PHOTO, "image/jpeg", now);

UUID recordId = UUID.randomUUID();
jdbcTemplate.update("""
INSERT INTO treatment_records (record_id, user_id, service_types, performed_at)
VALUES (?, ?, '[]'::jsonb, now())
""", recordId, USER_ID);
jdbcTemplate.update("""
INSERT INTO treatment_record_photos
(photo_id, record_id, file_id, image_type, sort_order)
VALUES (?, ?, ?, 'BEFORE', 0)
""", UUID.randomUUID(), recordId, treatmentPhoto.fileId());

UUID jobId = UUID.randomUUID();
UUID analysisId = UUID.randomUUID();
jdbcTemplate.update("""
INSERT INTO analysis_jobs
(job_id, user_id, record_id, status, progress, attempt_count)
VALUES (?, ?, ?, 'SUCCEEDED', 100, 1)
""", jobId, USER_ID, recordId);
jdbcTemplate.update("""
INSERT INTO analysis_results (
analysis_id, job_id, user_id, record_id,
color_uniformity_score, color_uniformity_grade,
shape_symmetry_score, shape_symmetry_grade,
volume_balance_score, volume_balance_grade,
roughness_score, roughness_grade,
confidence_score, confidence_grade, model_version, analyzed_at
) VALUES (
?, ?, ?, ?, 80, 'HIGH', 80, 'HIGH', 80, 'HIGH',
80, 'HIGH', 80, 'HIGH', 'test', now()
)
""", analysisId, jobId, USER_ID, recordId);
jdbcTemplate.update("""
INSERT INTO analysis_overlays (overlay_id, analysis_id, overlay_type, file_id)
VALUES (?, ?, 'HEATMAP', ?)
""", UUID.randomUUID(), analysisId, analysisOverlay.fileId());

UUID hairstyleId = UUID.randomUUID();
jdbcTemplate.update("""
INSERT INTO hairstyle_assets (
hairstyle_id, style_name, category, thumbnail_file_id,
base_file_id, mask_file_id, asset_version
) VALUES (?, '정리 참조 테스트', 'TEST', ?, ?, ?, 'test')
""", hairstyleId, thumbnail.fileId(), arBase.fileId(), arMask.fileId());
jdbcTemplate.update("""
INSERT INTO saved_styles (saved_style_id, user_id, style_name, capture_id)
VALUES (?, ?, '저장 후보 정리 테스트', ?)
""", UUID.randomUUID(), USER_ID, savedCapture.fileId());

List<StoredFile> candidates = adapter.findCleanupCandidates(
now.minusSeconds(60), now.minusSeconds(86_400), 100);

assertThat(candidates).extracting(StoredFile::fileId)
.contains(orphan.fileId())
.doesNotContain(
treatmentPhoto.fileId(), analysisOverlay.fileId(), thumbnail.fileId(),
arBase.fileId(), arMask.fileId(), savedCapture.fileId());
}

// ------------------------------------------------------------------ 스키마 대조

@Test
Expand Down Expand Up @@ -331,6 +413,36 @@ private static StoredFile expiredPendingPhoto(String name) {
Instant.now().minus(1, ChronoUnit.MINUTES));
}

private StoredFile oldReadyUserFile(
String name, FilePurpose purpose, String contentType, Instant now
) {
StoredFile pending = adapter.insert(StoredFile.pending(
USER_ID, purpose, purpose + "/" + USER_ID + "/" + name,
contentType, name, 1_024, DECLARED_SHA256,
now.plus(5, ChronoUnit.MINUTES)));
StoredFile ready = adapter.transition(
pending.markReady(new StorageObject(contentType, 1_024)), FileStatus.PENDING);
makeOld(ready.fileId(), now);
return ready;
}

private StoredFile oldReadySystemFile(
String name, FilePurpose purpose, String contentType, Instant now
) {
StoredFile pending = adapter.insert(StoredFile.pendingSystem(
purpose, purpose + "/system/" + name, contentType, name, 1_024,
DECLARED_SHA256, now.plus(5, ChronoUnit.MINUTES)));
StoredFile ready = adapter.transition(
pending.markReady(new StorageObject(contentType, 1_024)), FileStatus.PENDING);
makeOld(ready.fileId(), now);
return ready;
}

private void makeOld(UUID fileId, Instant now) {
jdbcTemplate.update("UPDATE files SET created_at = ? WHERE file_id = ?",
Timestamp.from(now.minusSeconds(172_800)), fileId);
}

private void insertUser(UUID userId, String email) {
jdbcTemplate.update("""
INSERT INTO users (
Expand Down
Loading