Compare commits

..

46 Commits

Author SHA1 Message Date
ByungCheol 74a2cae9ef Merge branch 'dev'
Deploy / deploy (push) Failing after 15m11s
2026-06-28 12:29:27 +09:00
ByungCheol 6e269888c2 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m49s
2026-06-28 11:07:51 +09:00
ByungCheol 39a11d299c Merge branch 'dev'
Deploy / deploy (push) Failing after 11m53s
2026-06-28 09:22:46 +09:00
ByungCheol f19f653715 Merge branch 'dev'
Deploy / deploy (push) Failing after 13m31s
CI / build (push) Failing after 15m20s
2026-06-28 09:04:22 +09:00
ByungCheol 16ddf88de3 Merge branch 'dev'
Deploy / deploy (push) Failing after 14m0s
CI / build (push) Failing after 15m50s
2026-06-28 08:38:52 +09:00
ByungCheol d794549f66 Merge branch 'dev'
Deploy / deploy (push) Failing after 12m43s
CI / build (push) Failing after 14m31s
2026-06-27 23:00:14 +09:00
ByungCheol 0e26237577 Merge branch 'dev'
CI / build (push) Failing after 12m28s
Deploy / deploy (push) Failing after 15m38s
2026-06-27 22:27:13 +09:00
ByungCheol 1646ec0a7f Merge branch 'dev'
Deploy / deploy (push) Failing after 11m22s
CI / build (push) Failing after 13m9s
2026-06-27 19:02:12 +09:00
ByungCheol fe0837cfd6 Merge branch 'dev'
Deploy / deploy (push) Successful in 50s
CI / build (push) Failing after 12m12s
2026-06-27 18:03:44 +09:00
ByungCheol 68f6c985bc Merge branch 'dev'
Deploy / deploy (push) Failing after 12m4s
CI / build (push) Failing after 14m3s
2026-06-27 14:47:00 +09:00
ByungCheol 47a01356a5 Merge branch 'dev'
CI / build (push) Failing after 12m36s
Deploy / deploy (push) Failing after 15m41s
2026-06-24 23:03:38 +09:00
ByungCheol 236332637a Merge branch 'dev'
Deploy / deploy (push) Failing after 13m31s
CI / build (push) Failing after 15m21s
2026-06-22 23:16:03 +09:00
ByungCheol 0e71e7b8cc Merge branch 'dev'
Deploy / deploy (push) Failing after 11m25s
CI / build (push) Failing after 13m19s
2026-06-22 22:38:06 +09:00
ByungCheol 9d4a415f2e Merge branch 'dev'
Deploy / deploy (push) Successful in 51s
CI / build (push) Failing after 12m48s
2026-06-20 17:13:14 +09:00
ByungCheol 5230ba1587 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m6s
CI / build (push) Failing after 13m0s
2026-06-14 15:43:30 +09:00
ByungCheol 1f8b968588 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m55s
CI / build (push) Failing after 13m43s
2026-06-12 22:52:23 +09:00
ByungCheol b90f9ea3b8 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m21s
CI / build (push) Failing after 13m9s
2026-06-12 22:22:59 +09:00
ByungCheol a61700bdf6 Merge branch 'dev'
Deploy / deploy (push) Failing after 13m5s
CI / build (push) Failing after 14m58s
2026-06-12 22:16:09 +09:00
ByungCheol 484732c5ed Merge branch 'dev'
Deploy / deploy (push) Failing after 11m54s
CI / build (push) Failing after 13m49s
2026-06-09 22:47:32 +09:00
ByungCheol e3a24848bc Merge branch 'dev'
Deploy / deploy (push) Failing after 12m3s
CI / build (push) Failing after 13m52s
2026-06-07 20:32:38 +09:00
ByungCheol fd25968d0e Merge branch 'dev'
Deploy / deploy (push) Failing after 12m12s
CI / build (push) Failing after 14m4s
2026-06-07 19:17:25 +09:00
ByungCheol c61cec6dad Merge branch 'dev'
Deploy / deploy (push) Failing after 11m5s
CI / build (push) Failing after 12m55s
2026-06-06 17:33:33 +09:00
ByungCheol 2eef5c3b3e Merge branch 'dev'
Deploy / deploy (push) Failing after 11m56s
CI / build (push) Failing after 13m46s
2026-06-06 16:42:34 +09:00
ByungCheol 4f8ade5ff3 Merge branch 'dev'
CI / build (push) Failing after 12m27s
Deploy / deploy (push) Failing after 15m41s
2026-06-06 15:03:53 +09:00
ByungCheol 8bfe596f4e Merge branch 'dev'
CI / build (push) Failing after 11m31s
Deploy / deploy (push) Failing after 14m44s
2026-06-06 14:49:48 +09:00
ByungCheol 76bbf195df Merge branch 'dev'
Deploy / deploy (push) Failing after 12m0s
CI / build (push) Failing after 13m45s
2026-06-06 14:27:33 +09:00
ByungCheol b62b51b789 Merge branch 'dev'
Deploy / deploy (push) Failing after 12m22s
CI / build (push) Failing after 14m11s
2026-06-06 14:14:15 +09:00
ByungCheol 91cc5558e4 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m20s
CI / build (push) Failing after 13m8s
2026-06-06 14:08:13 +09:00
ByungCheol 27b8829def Merge branch 'dev'
Deploy / deploy (push) Failing after 11m29s
CI / build (push) Failing after 13m15s
2026-06-06 08:13:03 +09:00
ByungCheol ad2ee4e75d Merge branch 'dev'
Deploy / deploy (push) Failing after 13m1s
CI / build (push) Failing after 14m52s
2026-06-06 00:16:30 +09:00
ByungCheol eb24a315d3 Merge branch 'dev'
CI / build (push) Failing after 11m1s
Deploy / deploy (push) Failing after 14m15s
2026-06-04 05:00:27 +09:00
ByungCheol 396e986792 Merge branch 'dev'
Deploy / deploy (push) Failing after 11m21s
CI / build (push) Failing after 13m3s
2026-06-03 18:51:32 +09:00
ByungCheol 191f1cfbe4 Merge branch 'dev'
CI / build (push) Failing after 12m15s
Deploy / deploy (push) Failing after 15m32s
2026-06-03 17:37:20 +09:00
ByungCheol 1d4dbc2183 Merge branch 'dev'
CI / build (push) Failing after 12m10s
Deploy / deploy (push) Failing after 15m27s
2026-06-03 16:42:22 +09:00
ByungCheol 478a75b6d8 Merge branch 'dev' into main
Deploy / deploy (push) Failing after 13m38s
CI / build (push) Failing after 15m20s
2026-06-01 22:54:25 +09:00
ByungCheol 41a5780e14 Merge branch 'dev' into main
CI / build (push) Successful in 50s
Deploy / deploy (push) Failing after 15m16s
2026-06-01 22:37:43 +09:00
ByungCheol 86c56f6c6f Merge branch 'dev' into main
Deploy / deploy (push) Failing after 11m36s
CI / build (push) Failing after 13m18s
2026-05-31 21:46:30 +09:00
ByungCheol bd1164866c Merge branch 'dev' into main
Deploy / deploy (push) Failing after 13m16s
CI / build (push) Failing after 14m57s
2026-05-31 20:49:52 +09:00
ByungCheol f884cb7b06 Merge branch 'dev' into main
CI / build (push) Failing after 11m54s
Deploy / deploy (push) Failing after 15m13s
2026-05-31 19:12:56 +09:00
ByungCheol e5fd31843a Merge branch 'dev' into main
Deploy / deploy (push) Failing after 11m27s
CI / build (push) Failing after 13m7s
2026-05-31 19:01:43 +09:00
ByungCheol a821cd8f89 Merge branch 'dev' into main
Deploy / deploy (push) Failing after 11m24s
CI / build (push) Failing after 13m6s
2026-05-31 18:46:44 +09:00
ByungCheol cf275fabf6 Merge branch 'dev' into main
CI / build (push) Failing after 11m53s
Deploy / deploy (push) Failing after 15m12s
2026-05-31 18:22:53 +09:00
ByungCheol d373e3e9e4 Merge branch 'dev' into main
Deploy / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
fix(ci): SSH 개인키 CR 제거
2026-05-31 17:40:10 +09:00
ByungCheol f79c2412fd Merge branch 'dev' into main
Deploy / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
ci: 자동 배포 워크플로 + 서버 설정 파일
2026-05-31 15:55:35 +09:00
ByungCheol f3230dcc5b Merge branch 'dev' into main
CI / build (push) Failing after 12m12s
ci: Gitea Actions CI/CD 워크플로 추가
2026-05-31 15:49:08 +09:00
ByungCheol ef7d0f7f83 Merge branch 'dev' into main
가계부·게시판 백엔드 API 구현 (account/auth/board/user/admin)
2026-05-31 15:45:25 +09:00
73 changed files with 146 additions and 1661 deletions
-4
View File
@@ -2,10 +2,6 @@ HELP.md
.gradle
build/
# 로컬 전용 테스트/시드 스크립트 (실제 이메일·프리미엄 부여 포함 — 커밋 금지)
scripts/seed-test-*.sql
scripts/cleanup-test-*.sql
# 환경변수 / 비밀 정보 (실제 .env 는 커밋 금지, .env.example 만 추적)
.env
!gradle/wrapper/gradle-wrapper.jar
@@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
@MapperScan({"com.sb.web.user.mapper", "com.sb.web.auth.mapper", "com.sb.web.board.mapper", "com.sb.web.account.mapper", "com.sb.web.admin.mapper", "com.sb.web.point.mapper", "com.sb.web.billing.mapper"})
@MapperScan({"com.sb.web.user.mapper", "com.sb.web.auth.mapper", "com.sb.web.board.mapper", "com.sb.web.account.mapper", "com.sb.web.admin.mapper", "com.sb.web.point.mapper"})
public class SbBtApplication {
public static void main(String[] args) {
@@ -50,22 +50,8 @@ public class BudgetController {
@GetMapping
public List<BudgetResponse> list(
@RequestParam int year,
@RequestParam int month,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return budgetService.list(current.getId(), year, month);
}
/** 다른 월의 예산을 이 달로 복사(전월 복사 등). 같은 분류는 덮어씀 */
@PostMapping("/copy")
public List<BudgetResponse> copy(
@RequestParam int fromYear,
@RequestParam int fromMonth,
@RequestParam int toYear,
@RequestParam int toMonth,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
budgetService.copy(current.getId(), fromYear, fromMonth, toYear, toMonth);
return budgetService.list(current.getId(), toYear, toMonth);
return budgetService.list(current.getId());
}
@GetMapping("/status")
@@ -88,11 +74,9 @@ public class BudgetController {
@PostMapping
public ResponseEntity<BudgetResponse> create(
@RequestParam int year,
@RequestParam int month,
@Valid @RequestBody BudgetRequest req,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return ResponseEntity.status(HttpStatus.CREATED).body(budgetService.create(req, current.getId(), year, month));
return ResponseEntity.status(HttpStatus.CREATED).body(budgetService.create(req, current.getId()));
}
@PutMapping("/{id}")
@@ -1,37 +0,0 @@
package com.sb.web.account.controller;
import com.sb.web.account.service.FxService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
/**
* 환율 조회 API. 외화 결제 입력 시 통화→원화 환율 자동 채움용.
* GET /api/fx/rate?from=USD&to=KRW → { from, to, rate }
*/
@RestController
@RequestMapping("/api/fx")
public class FxController {
private final FxService fxService;
public FxController(FxService fxService) {
this.fxService = fxService;
}
@GetMapping("/rate")
public Map<String, Object> rate(@RequestParam String from,
@RequestParam(defaultValue = "KRW") String to) {
BigDecimal rate = fxService.getRate(from, to);
Map<String, Object> res = new HashMap<>();
res.put("from", from == null ? null : from.toUpperCase());
res.put("to", to == null ? null : to.toUpperCase());
res.put("rate", rate); // 조회 실패 시 null
return res;
}
}
@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -31,9 +30,6 @@ public class AccountEntry implements Serializable {
private Long toWalletId; // 이체 입금 계좌
private String toWalletName;
private Integer installmentMonths; // 카드 할부 개월수(2~24, 일시불은 null)
private String currency; // 외화 통화코드(USD 등). null/KRW = 원화
private BigDecimal originalAmount; // 외화 원본 금액
private BigDecimal exchangeRate; // 적용 환율(외화 1단위→원화)
private Boolean pending; // 확인 필요(미확정) 여부 — 알림 자동인식 건
private String notifKey; // 알림 자동인식 중복방지 키
private LocalDateTime createdAt;
@@ -28,8 +28,6 @@ public class Budget implements Serializable {
private Long weekly;
private Long monthly;
private Long yearly;
private Integer year; // 예산 연도(월별 예산)
private Integer month; // 예산 월(1~12)
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -30,11 +29,6 @@ public class Wallet implements Serializable {
private Long openingBalance; // 초기 잔액(부호있음: 자산+, 부채-)
private LocalDate openingDate;
private Long currentValue; // 현재 평가금액 (INVEST 전용, 수동 갱신)
private Long loanAmount; // 대출 실행 금액(원금, 처음 빌린 금액) (LOAN 전용)
private BigDecimal loanRate; // 연이자율(%) e.g. 5.25 (LOAN 전용)
private String loanMethod; // 상환방식: EQUAL_PAYMENT / EQUAL_PRINCIPAL / BULLET (LOAN 전용)
private Integer loanMonths; // 대출기간(개월) (LOAN 전용)
private LocalDate loanStart; // 대출시작일 (LOAN 전용)
private Integer sortOrder; // 표시 순서 (타입 내 정렬)
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
@@ -9,7 +9,6 @@ import jakarta.validation.constraints.PositiveOrZero;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
@@ -49,10 +48,4 @@ public class AccountEntryRequest {
/** 선택한 태그 ID 목록 (태그 관리에 등록된 태그, 선택) */
private List<Long> tagIds;
/** 외화 결제(선택). currency 가 있으면 amount 는 환산된 원화여야 한다. */
@Size(max = 3, message = "통화코드가 올바르지 않습니다.")
private String currency; // USD/JPY 등. null/KRW = 원화
private BigDecimal originalAmount; // 외화 원본 금액
private BigDecimal exchangeRate; // 적용 환율(외화 1단위→원화)
}
@@ -4,7 +4,6 @@ import com.sb.web.account.domain.AccountEntry;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
@@ -27,9 +26,6 @@ public class AccountEntryResponse {
private String toWalletName;
private Integer installmentMonths;
private Boolean pending;
private String currency;
private BigDecimal originalAmount;
private BigDecimal exchangeRate;
private List<String> tags;
public static AccountEntryResponse from(AccountEntry e, List<String> tags) {
@@ -46,9 +42,6 @@ public class AccountEntryResponse {
.toWalletName(e.getToWalletName())
.installmentMonths(e.getInstallmentMonths())
.pending(Boolean.TRUE.equals(e.getPending()))
.currency(e.getCurrency())
.originalAmount(e.getOriginalAmount())
.exchangeRate(e.getExchangeRate())
.tags(tags)
.build();
}
@@ -1,13 +1,10 @@
package com.sb.web.account.dto;
import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@@ -40,17 +37,4 @@ public class WalletRequest {
/** 현재 평가금액 (INVEST 전용, 수동 갱신) */
private Long currentValue;
// ===== 대출(LOAN) 전용 =====
private Long loanAmount; // 대출 실행 금액(원금)
@DecimalMin(value = "0.0", inclusive = true)
@DecimalMax(value = "100.0", message = "이자율은 100% 이하여야 합니다.")
private BigDecimal loanRate; // 연이자율(%)
@Pattern(regexp = "EQUAL_PAYMENT|EQUAL_PRINCIPAL|BULLET|", message = "상환방식이 올바르지 않습니다.")
private String loanMethod; // 상환방식
private Integer loanMonths; // 대출기간(개월)
private LocalDate loanStart; // 대출시작일
}
@@ -4,7 +4,6 @@ import com.sb.web.account.domain.Wallet;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@@ -32,13 +31,6 @@ public class WalletResponse {
private Long currentValue; // 평가액 직접입력값(퇴직연금·연금 등 수동 갱신). 있으면 총평가로 사용
private Boolean manualValuation; // true면 평가액 직접입력형(종목 자동계산 대신)
// 대출(LOAN) 전용
private Long loanAmount; // 대출 실행 금액(원금)
private BigDecimal loanRate; // 연이자율(%) e.g. 5.25
private String loanMethod; // EQUAL_PAYMENT / EQUAL_PRINCIPAL / BULLET
private Integer loanMonths; // 대출기간(개월)
private LocalDate loanStart; // 대출시작일
public static WalletResponse from(Wallet w, long balance) {
return WalletResponse.builder()
.id(w.getId())
@@ -51,11 +43,6 @@ public class WalletResponse {
.openingDate(w.getOpeningDate())
.balance(balance)
.currentValue(w.getCurrentValue())
.loanAmount(w.getLoanAmount())
.loanRate(w.getLoanRate())
.loanMethod(w.getLoanMethod())
.loanMonths(w.getLoanMonths())
.loanStart(w.getLoanStart())
.build();
}
}
@@ -12,24 +12,13 @@ import java.util.List;
@Mapper
public interface BudgetMapper {
List<Budget> findByMember(@Param("memberId") Long memberId,
@Param("year") Integer year,
@Param("month") Integer month);
List<Budget> findByMember(@Param("memberId") Long memberId);
Budget findByIdAndMember(@Param("id") Long id, @Param("memberId") Long memberId);
int countByCategory(@Param("memberId") Long memberId,
@Param("category") String category,
@Param("excludeId") Long excludeId,
@Param("year") Integer year,
@Param("month") Integer month);
/** fromYear/fromMonth 예산을 toYear/toMonth 로 복사(같은 분류는 덮어씀). 복사된 건수 반환 */
int copyMonth(@Param("memberId") Long memberId,
@Param("fromYear") Integer fromYear,
@Param("fromMonth") Integer fromMonth,
@Param("toYear") Integer toYear,
@Param("toMonth") Integer toMonth);
@Param("excludeId") Long excludeId);
int insert(Budget budget);
@@ -234,9 +234,6 @@ public class AccountService {
.walletId(req.getWalletId())
.toWalletId(transfer ? req.getToWalletId() : null)
.installmentMonths(installmentOf(req))
.currency(req.getCurrency())
.originalAmount(req.getOriginalAmount())
.exchangeRate(req.getExchangeRate())
.build();
mapper.insert(entry);
applyTags(entry.getId(), req.getTagIds(), memberId);
@@ -256,9 +253,6 @@ public class AccountService {
entry.setWalletId(req.getWalletId());
entry.setToWalletId(transfer ? req.getToWalletId() : null);
entry.setInstallmentMonths(installmentOf(req));
entry.setCurrency(req.getCurrency());
entry.setOriginalAmount(req.getOriginalAmount());
entry.setExchangeRate(req.getExchangeRate());
mapper.update(entry);
mapper.deleteEntryTagsByEntryId(id);
@@ -535,12 +529,6 @@ public class AccountService {
wallet.setOpeningBalance(req.getOpeningBalance() != null ? req.getOpeningBalance() : 0L);
wallet.setOpeningDate(req.getOpeningDate());
wallet.setCurrentValue("INVEST".equals(req.getType()) ? req.getCurrentValue() : null);
boolean isLoan = "LOAN".equals(req.getType());
wallet.setLoanAmount(isLoan ? req.getLoanAmount() : null);
wallet.setLoanRate(isLoan ? req.getLoanRate() : null);
wallet.setLoanMethod(isLoan ? blankToNull(req.getLoanMethod()) : null);
wallet.setLoanMonths(isLoan ? req.getLoanMonths() : null);
wallet.setLoanStart(isLoan ? req.getLoanStart() : null);
walletMapper.update(wallet);
return WalletResponse.from(wallet, balanceMap(memberId).getOrDefault(id, wallet.getOpeningBalance()));
}
@@ -570,7 +558,6 @@ public class AccountService {
}
private Wallet toWallet(WalletRequest req) {
boolean isLoan = "LOAN".equals(req.getType());
return Wallet.builder()
.type(req.getType())
.name(req.getName().trim())
@@ -580,11 +567,6 @@ public class AccountService {
.openingBalance(req.getOpeningBalance() != null ? req.getOpeningBalance() : 0L)
.openingDate(req.getOpeningDate())
.currentValue("INVEST".equals(req.getType()) ? req.getCurrentValue() : null)
.loanAmount(isLoan ? req.getLoanAmount() : null)
.loanRate(isLoan ? req.getLoanRate() : null)
.loanMethod(isLoan ? blankToNull(req.getLoanMethod()) : null)
.loanMonths(isLoan ? req.getLoanMonths() : null)
.loanStart(isLoan ? req.getLoanStart() : null)
.build();
}
@@ -156,12 +156,11 @@ public class BackupService {
}
}
// 7) 예산 — 복구 시 현재 월 예산으로 등록(백업엔 월 정보 없음)
// 7) 예산
if (req.getBudgets() != null) {
java.time.LocalDate today = java.time.LocalDate.now();
for (BudgetRequest b : req.getBudgets()) {
if (b == null || b.getCategory() == null) continue;
budgetService.create(b, memberId, today.getYear(), today.getMonthValue());
budgetService.create(b, memberId);
}
}
@@ -31,46 +31,36 @@ public class BudgetService {
private final BudgetMapper budgetMapper;
private final AccountEntryMapper entryMapper;
public List<BudgetResponse> list(Long memberId, int year, int month) {
return budgetMapper.findByMember(memberId, year, month).stream().map(BudgetResponse::from).toList();
public List<BudgetResponse> list(Long memberId) {
return budgetMapper.findByMember(memberId).stream().map(BudgetResponse::from).toList();
}
@Transactional
public BudgetResponse create(BudgetRequest req, Long memberId, int year, int month) {
public BudgetResponse create(BudgetRequest req, Long memberId) {
String category = req.getCategory().trim();
if (budgetMapper.countByCategory(memberId, category, null, year, month) > 0) {
if (budgetMapper.countByCategory(memberId, category, null) > 0) {
throw new ApiException(HttpStatus.CONFLICT, "이미 예산이 설정된 카테고리입니다.");
}
Budget budget = toBudget(req, category);
budget.setMemberId(memberId);
budget.setYear(year);
budget.setMonth(month);
budgetMapper.insert(budget);
return BudgetResponse.from(budget);
}
@Transactional
public BudgetResponse update(Long id, BudgetRequest req, Long memberId) {
Budget existing = mustFind(id, memberId);
mustFind(id, memberId);
String category = req.getCategory().trim();
if (budgetMapper.countByCategory(memberId, category, id, existing.getYear(), existing.getMonth()) > 0) {
if (budgetMapper.countByCategory(memberId, category, id) > 0) {
throw new ApiException(HttpStatus.CONFLICT, "이미 예산이 설정된 카테고리입니다.");
}
Budget budget = toBudget(req, category);
budget.setId(id);
budget.setMemberId(memberId);
budget.setYear(existing.getYear());
budget.setMonth(existing.getMonth());
budgetMapper.update(budget);
return BudgetResponse.from(budget);
}
/** fromYear/fromMonth 예산을 toYear/toMonth 로 복사(같은 분류 덮어씀). 복사된 건수 반환 */
@Transactional
public int copy(Long memberId, int fromYear, int fromMonth, int toYear, int toMonth) {
return budgetMapper.copyMonth(memberId, fromYear, fromMonth, toYear, toMonth);
}
@Transactional
public void delete(Long id, Long memberId) {
mustFind(id, memberId);
@@ -89,7 +79,7 @@ public class BudgetService {
}
List<BudgetStatus> result = new ArrayList<>();
for (Budget b : budgetMapper.findByMember(memberId, year, month)) {
for (Budget b : budgetMapper.findByMember(memberId)) {
long monthlyBudget = monthlyBudget(b, daysInMonth);
long spent = spentByCategory.getOrDefault(b.getCategory(), 0L);
result.add(BudgetStatus.builder()
@@ -113,8 +103,7 @@ public class BudgetService {
int y = year != null ? year : Year.now().getValue();
int m = month != null ? month : 1;
// 기간 차트는 선택 월의 예산을 기준으로 각 버킷에 적용(월별 예산 도입 전 동작과 동일)
List<Budget> budgets = budgetMapper.findByMember(memberId, y, m);
List<Budget> budgets = budgetMapper.findByMember(memberId);
Map<String, Long> expense = new HashMap<>();
for (Map<String, Object> row : entryMapper.statsByPeriod(memberId, unit, year, month)) {
expense.put(String.valueOf(((Number) row.get("bucket")).longValue()),
@@ -1,75 +0,0 @@
package com.sb.web.account.service;
import com.sb.web.account.domain.DefaultCategory;
import com.sb.web.account.mapper.DefaultCategoryMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* 기본(디폴트) 분류 초기 시드. default_category 가 비어 있을 때만 한 번 생성한다.
* (관리자가 이후 자유롭게 수정/삭제 가능 — 비어 있을 때만 채우므로 운영 데이터를 덮어쓰지 않음)
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class DefaultCategorySeeder implements ApplicationRunner {
private final DefaultCategoryMapper mapper;
// 대분류 → 소분류 목록 (입력 순서 유지)
private static final Map<String, List<String>> EXPENSE = new LinkedHashMap<>();
private static final Map<String, List<String>> INCOME = new LinkedHashMap<>();
static {
EXPENSE.put("식비", List.of("외식", "식료품", "카페/간식", "배달"));
EXPENSE.put("교통", List.of("대중교통", "택시", "주유", "주차/통행료"));
EXPENSE.put("주거/통신", List.of("월세/관리비", "공과금", "통신비", "인터넷"));
EXPENSE.put("생활", List.of("생필품", "의류/미용", "가구/가전"));
EXPENSE.put("건강/의료", List.of("병원", "약국", "운동"));
EXPENSE.put("문화/여가", List.of("영화/공연", "여행", "취미", "구독서비스"));
EXPENSE.put("교육", List.of("학원", "도서", "강의"));
EXPENSE.put("경조사", List.of("축의금", "부의금", "선물"));
EXPENSE.put("금융", List.of("보험", "대출이자", "수수료"));
EXPENSE.put("기타", List.of());
INCOME.put("급여", List.of("월급", "상여금"));
INCOME.put("부수입", List.of("용돈", "이자/배당", "환급"));
INCOME.put("기타수입", List.of("중고판매", "기타"));
}
@Override
@Transactional
public void run(ApplicationArguments args) {
if (!mapper.findAll().isEmpty()) {
return; // 이미 데이터가 있으면 시드하지 않음
}
int n = seed("EXPENSE", EXPENSE) + seed("INCOME", INCOME);
log.info("[default-category] 기본 분류 시드 생성: {}건", n);
}
private int seed(String type, Map<String, List<String>> tree) {
int count = 0;
int majorOrder = 0;
for (Map.Entry<String, List<String>> e : tree.entrySet()) {
DefaultCategory major = DefaultCategory.builder()
.type(type).name(e.getKey()).parentId(null).sortOrder(majorOrder++).build();
mapper.insert(major); // 생성키(id) 채워짐
count++;
int subOrder = 0;
for (String child : e.getValue()) {
mapper.insert(DefaultCategory.builder()
.type(type).name(child).parentId(major.getId()).sortOrder(subOrder++).build());
count++;
}
}
return count;
}
}
@@ -1,64 +0,0 @@
package com.sb.web.account.service;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClient;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* 환율 조회. open.er-api.com(무료·무인증) 사용. 통화(base)별로 하루 1회만 호출하고 캐시.
* 실패해도 예외를 던지지 않고 null(또는 직전 캐시) 반환.
*/
@Slf4j
@Service
public class FxService {
private static final String URL = "https://open.er-api.com/v6/latest/{base}";
private final RestClient restClient = RestClient.builder().build();
private record Cached(LocalDate date, JsonNode rates) {}
private final Map<String, Cached> cache = new ConcurrentHashMap<>();
/** from 통화 1단위 → to 통화 환율. 조회 실패 시 null. */
public BigDecimal getRate(String from, String to) {
if (from == null || to == null) return null;
String base = from.trim().toUpperCase();
String target = to.trim().toUpperCase();
if (base.isEmpty() || target.isEmpty()) return null;
if (base.equals(target)) return BigDecimal.ONE;
JsonNode rates = ratesFor(base);
if (rates == null) return null;
JsonNode r = rates.get(target);
return (r != null && r.isNumber()) ? r.decimalValue() : null;
}
private JsonNode ratesFor(String base) {
Cached c = cache.get(base);
LocalDate today = LocalDate.now();
if (c != null && c.date().equals(today)) return c.rates();
try {
JsonNode root = restClient.get()
.uri(URL, base)
.header("User-Agent", "Mozilla/5.0")
.retrieve()
.body(JsonNode.class);
if (root == null || !"success".equals(root.path("result").asText())) {
return c != null ? c.rates() : null;
}
JsonNode rates = root.path("rates");
if (rates.isMissingNode() || !rates.isObject()) {
return c != null ? c.rates() : null;
}
cache.put(base, new Cached(today, rates));
return rates;
} catch (Exception e) {
log.warn("환율 조회 실패 base={}: {}", base, e.toString());
return c != null ? c.rates() : null; // 실패 시 직전 캐시라도
}
}
}
@@ -1,5 +1,7 @@
package com.sb.web.admin.controller;
import com.sb.web.board.dto.BoardSettingRequest;
import com.sb.web.board.dto.BoardSettingResponse;
import com.sb.web.board.dto.TagCategoryRequest;
import com.sb.web.board.dto.TagCategoryResponse;
import com.sb.web.board.dto.TagRequest;
@@ -66,4 +68,16 @@ public class AdminTagController {
tagService.deleteTag(id);
return ResponseEntity.noContent().build();
}
/* ===== 게시판 설정 (사용할 태그 카테고리) ===== */
@GetMapping("/board-setting")
public BoardSettingResponse boardSetting() {
return tagService.getBoardSetting();
}
@PutMapping("/board-setting")
public BoardSettingResponse updateBoardSetting(@RequestBody BoardSettingRequest req) {
return tagService.setBoardSetting(req.getTagCategoryId());
}
}
@@ -80,15 +80,6 @@ public class AuthController {
return current;
}
/** 회원 탈퇴 — 본인 계정과 모든 데이터 삭제 */
@DeleteMapping("/me")
public ResponseEntity<Void> withdraw(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current,
HttpServletRequest request) {
authService.withdraw(current.getId(), AuthInterceptor.resolveToken(request));
return ResponseEntity.noContent().build();
}
/** 현재 사용자 활동 포인트 (최신값 — 게시판 작성으로 수시 변동) */
@GetMapping("/points")
public java.util.Map<String, Long> points(
@@ -96,13 +87,6 @@ public class AuthController {
return java.util.Map.of("points", pointService.getPoints(current.getId()));
}
/** 포인트 적립/차감 내역 (최신순) */
@GetMapping("/point-history")
public java.util.List<com.sb.web.point.PointHistoryResponse> pointHistory(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return pointService.getHistory(current.getId());
}
@PutMapping("/password")
public ResponseEntity<Void> changePassword(
@Valid @RequestBody PasswordChangeRequest req,
@@ -120,12 +104,6 @@ public class AuthController {
return ResponseEntity.noContent().build();
}
/** 현재 회원 전체 프로필 (아바타·포인트 포함) — 재로그인 없이 최신값 동기화 */
@GetMapping("/profile")
public MemberResponse profile(@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return authService.getProfile(current.getId());
}
/** 가입정보(이름/이메일) 변경 */
@PutMapping("/profile")
public MemberResponse updateProfile(
@@ -30,9 +30,6 @@ public class Member implements Serializable {
private String profileImage; // 사용자 지정 프로필 이미지(data URL). 우선순위: profileImage > googlePicture > 이니셜
private String role; // USER / ADMIN
private String plan; // FREE / PREMIUM (멤버십)
private LocalDateTime planExpiresAt; // 유료 멤버십 만료일 (NULL=만료없음/무료)
private String planProduct; // 구독 상품 ID (premium_monthly 등)
private Boolean planAutoRenew; // 자동 갱신 여부 (해지 시 false)
private Long points; // 활동 포인트 (게시판 글/댓글 작성 보상)
private String status; // ACTIVE / SUSPENDED / WITHDRAWN
private LocalDateTime createdAt;
@@ -18,9 +18,6 @@ public class MemberResponse {
private String provider;
private String role;
private String plan; // FREE / PREMIUM
private java.time.LocalDateTime planExpiresAt; // 유료 멤버십 만료일
private String planProduct; // 구독 상품 ID
private Boolean planAutoRenew; // 자동 갱신 여부
private Long points; // 활동 포인트
private String googlePicture; // 구글 아바타 URL
private String profileImage; // 사용자 지정 프로필 이미지(data URL)
@@ -34,9 +31,6 @@ public class MemberResponse {
.provider(m.getProvider())
.role(m.getRole())
.plan(m.getPlan())
.planExpiresAt(m.getPlanExpiresAt())
.planProduct(m.getPlanProduct())
.planAutoRenew(m.getPlanAutoRenew())
.points(m.getPoints())
.googlePicture(m.getGooglePicture())
.profileImage(m.getProfileImage())
@@ -21,9 +21,6 @@ public interface AuthSessionMapper {
/** 프로필 변경 시 백업 세션의 표시 이름 동기화 */
int updateName(@Param("token") String token, @Param("name") String name);
/** 멤버십 변경 시 백업 세션의 plan 동기화 */
int updatePlan(@Param("token") String token, @Param("plan") String plan);
int delete(@Param("token") String token);
int deleteExpired(@Param("now") LocalDateTime now);
@@ -50,17 +50,6 @@ public interface MemberMapper {
int updatePlan(@Param("id") Long id, @Param("plan") String plan);
/** 결제로 멤버십 부여/갱신 (plan + 만료일 + 구독상품 + 자동갱신) */
int updateMembership(@Param("id") Long id, @Param("plan") String plan,
@Param("expiresAt") java.time.LocalDateTime expiresAt,
@Param("product") String product, @Param("autoRenew") boolean autoRenew);
/** 구독 해지/재개 (자동 갱신 플래그) */
int updateAutoRenew(@Param("id") Long id, @Param("autoRenew") boolean autoRenew);
/** 만료된 유료회원을 FREE 로 강등 (스케줄러). 강등된 건수 반환 */
int downgradeExpired();
int updateStatus(@Param("id") Long id, @Param("status") String status);
int deleteById(@Param("id") Long id);
@@ -1,35 +0,0 @@
package com.sb.web.auth.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 회원 탈퇴 시 가계부(BackupMapper) 외의 사용자 데이터 정리 — 게시판/포인트/결제/세션.
*/
@Mapper
public interface WithdrawMapper {
// 게시판 — 내가 누른 표
int deletePostVotesByMember(@Param("memberId") Long memberId);
int deleteCommentVotesByMember(@Param("memberId") Long memberId);
// 게시판 — 내 글에 달린 것들 (남이 단 댓글/표 포함)
int deleteCommentVotesOnMyPosts(@Param("memberId") Long memberId);
int deletePostVotesOnMyPosts(@Param("memberId") Long memberId);
int deletePostTagsOnMyPosts(@Param("memberId") Long memberId);
int deleteCommentsOnMyPosts(@Param("memberId") Long memberId);
// 게시판 — 내 댓글(남의 글에 단 것)과 그 표
int deleteCommentVotesOnMyComments(@Param("memberId") Long memberId);
int deleteCommentsByAuthor(@Param("memberId") Long memberId);
// 게시판 — 내 글
int deletePostsByAuthor(@Param("memberId") Long memberId);
int deleteBoardImagesByMember(@Param("memberId") Long memberId);
// 신고 / 포인트 / 결제 / 세션
int deleteReportsByMember(@Param("memberId") Long memberId);
int deletePointHistory(@Param("memberId") Long memberId);
int deleteIapPurchases(@Param("memberId") Long memberId);
int deleteAuthSessions(@Param("memberId") Long memberId);
}
@@ -38,8 +38,6 @@ public class AuthService {
private final RedisTemplate<String, Object> redisTemplate;
private final com.sb.web.admin.service.AppSettingService appSettingService;
private final com.sb.web.auth.mapper.AuthSessionMapper authSessionMapper;
private final com.sb.web.auth.mapper.WithdrawMapper withdrawMapper;
private final com.sb.web.account.mapper.BackupMapper backupMapper;
/** 구글 OAuth 클라이언트 ID (ID 토큰 aud 검증용). 미설정 시 구글 로그인 비활성. */
@org.springframework.beans.factory.annotation.Value("${app.google-client-id:}")
@@ -291,51 +289,6 @@ public class AuthService {
}
}
/**
* 회원 탈퇴 — 사용자가 소유한 모든 데이터를 삭제하고 회원을 제거한다.
* (게시판 글/댓글/추천 · 가계부 전체 · 포인트 · 결제기록 · 세션 → 회원)
*/
@Transactional
public void withdraw(Long memberId, String token) {
Member member = memberMapper.findById(memberId);
if (member == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다.");
}
// 1) 게시판 — 표/댓글/글/이미지 (참조 순서 고려)
withdrawMapper.deletePostVotesByMember(memberId);
withdrawMapper.deleteCommentVotesByMember(memberId);
withdrawMapper.deleteCommentVotesOnMyPosts(memberId);
withdrawMapper.deleteCommentVotesOnMyComments(memberId);
withdrawMapper.deleteCommentsOnMyPosts(memberId);
withdrawMapper.deleteCommentsByAuthor(memberId);
withdrawMapper.deletePostVotesOnMyPosts(memberId);
withdrawMapper.deletePostTagsOnMyPosts(memberId);
withdrawMapper.deletePostsByAuthor(memberId);
withdrawMapper.deleteBoardImagesByMember(memberId);
// 2) 가계부(계정) 데이터 (복구 삭제와 동일 순서)
backupMapper.deleteEntryTags(memberId);
backupMapper.deleteEntries(memberId);
backupMapper.deleteRecurrings(memberId);
backupMapper.deleteBudgets(memberId);
backupMapper.deleteBudgetIncome(memberId);
backupMapper.deleteQuickEntries(memberId);
backupMapper.deleteInvestTrades(memberId);
backupMapper.deleteInvestHoldings(memberId);
backupMapper.deleteCategories(memberId);
backupMapper.deleteTags(memberId);
backupMapper.deleteWallets(memberId);
// 3) 신고 / 포인트 / 결제 / 세션
withdrawMapper.deleteReportsByMember(memberId);
withdrawMapper.deletePointHistory(memberId);
withdrawMapper.deleteIapPurchases(memberId);
withdrawMapper.deleteAuthSessions(memberId);
// 4) 회원 삭제
memberMapper.deleteById(memberId);
// 5) 현재 세션(Redis) 정리
logout(token);
log.info("[withdraw] member {} ({}) 및 데이터 전체 삭제", memberId, member.getLoginId());
}
/** 만료된 백업 세션 정리 (매일 새벽 4시) */
@org.springframework.scheduling.annotation.Scheduled(cron = "0 0 4 * * *")
public void cleanupExpiredSessions() {
@@ -366,15 +319,6 @@ public class AuthService {
}
}
/** 현재 회원 전체 프로필(아바타·포인트 포함) — 재로그인 없이 최신값 동기화용 */
public MemberResponse getProfile(Long memberId) {
Member member = memberMapper.findById(memberId);
if (member == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다.");
}
return MemberResponse.from(member);
}
/**
* 가입정보(이름/이메일) 변경. 비밀번호 인증을 통과한 화면에서 호출된다.
* 변경 후 세션(Redis + DB 백업)의 표시 이름도 동기화한다.
@@ -449,32 +393,6 @@ public class AuthService {
}
}
/** 결제/멤버십 변경 시 활성 세션(Redis + DB 백업)의 plan 을 즉시 맞춘다 (재로그인 없이 유료 기능 개방). */
public void syncSessionPlan(String token, String plan) {
if (token == null || token.isBlank()) {
return;
}
String key = SESSION_PREFIX + token;
try {
Object cached = redisTemplate.opsForValue().get(key);
if (cached instanceof SessionUser u) {
u.setPlan(plan);
Long ttl = redisTemplate.getExpire(key, java.util.concurrent.TimeUnit.SECONDS);
Duration remain = (ttl != null && ttl > 0)
? Duration.ofSeconds(ttl)
: (u.isRememberMe() ? REMEMBER_TTL : SESSION_TTL);
redisTemplate.opsForValue().set(key, u, remain);
}
} catch (Exception e) {
log.warn("[billing] Redis 세션 plan 동기화 실패(무시): {}", e.toString());
}
try {
authSessionMapper.updatePlan(token, plan);
} catch (Exception ignore) {
// DB 백업 동기화 실패해도 다음 로그인 시 갱신됨
}
}
/**
* 비밀번호 변경 (본인). 현재 비밀번호 검증 후 새 비밀번호로 교체.
*/
@@ -1,79 +0,0 @@
package com.sb.web.billing;
import com.sb.web.auth.dto.SessionUser;
import com.sb.web.auth.web.AuthInterceptor;
import com.sb.web.billing.dto.MembershipResponse;
import com.sb.web.billing.dto.ProductResponse;
import com.sb.web.billing.dto.SubscriptionResponse;
import com.sb.web.billing.dto.VerifyRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 인앱 결제 API. (/api/billing/** — 로그인 필요)
* GET /products 구독 상품 목록
* POST /google/verify Google Play 구매 검증 → 멤버십 부여
*/
@RestController
@RequestMapping("/api/billing")
@RequiredArgsConstructor
public class BillingController {
private final BillingService billingService;
@GetMapping("/products")
public List<ProductResponse> products() {
return billingService.products();
}
@PostMapping("/google/verify")
public MembershipResponse verifyGoogle(
@Valid @RequestBody VerifyRequest req,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current,
HttpServletRequest request) {
return billingService.verifyGoogle(current.getId(), AuthInterceptor.resolveToken(request), req);
}
/** 현재 구독 현황 (플랜·만료일·다음 결제일·자동갱신) */
@GetMapping("/subscription")
public SubscriptionResponse subscription(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return billingService.getSubscription(current.getId());
}
/** 구독 해지 (자동 갱신 중단, 만료일까지 이용) */
@PostMapping("/cancel")
public SubscriptionResponse cancel(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return billingService.cancel(current.getId());
}
/** 구독 재개 (만료 전 자동 갱신 재개) */
@PostMapping("/resume")
public SubscriptionResponse resume(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return billingService.resume(current.getId());
}
/** 구매 복원 (기기 변경·재설치 시 최근 결제 기준 멤버십 복구) */
@PostMapping("/restore")
public SubscriptionResponse restore(
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current,
HttpServletRequest request) {
return billingService.restore(current.getId(), AuthInterceptor.resolveToken(request));
}
/**
* Google Play 실시간 개발자 알림(RTDN) 수신 — Pub/Sub push (비인증).
* 스캐폴드: 수신/로깅만. 실연동 시 메시지 검증 + 구독상태(갱신/해지/환불) 동기화 구현.
*/
@PostMapping("/google/rtdn")
public org.springframework.http.ResponseEntity<Void> rtdn(@RequestBody(required = false) java.util.Map<String, Object> body) {
billingService.handleRtdn(body);
return org.springframework.http.ResponseEntity.ok().build();
}
}
@@ -1,202 +0,0 @@
package com.sb.web.billing;
import com.sb.web.auth.domain.Member;
import com.sb.web.auth.mapper.MemberMapper;
import com.sb.web.auth.service.AuthService;
import com.sb.web.billing.domain.IapPurchase;
import com.sb.web.billing.dto.MembershipResponse;
import com.sb.web.billing.dto.ProductResponse;
import com.sb.web.billing.dto.SubscriptionResponse;
import com.sb.web.billing.dto.VerifyRequest;
import com.sb.web.billing.mapper.IapPurchaseMapper;
import com.sb.web.common.exception.ApiException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* 인앱 결제(Google Play) 처리 — 상품 목록, 구매 검증 후 멤버십 부여.
* 스캐폴드: billing.test-mode=true 면 'test-' 토큰을 실제 검증 없이 승인한다.
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class BillingService {
private final MemberMapper memberMapper;
private final IapPurchaseMapper purchaseMapper;
private final GooglePlayVerifier googlePlayVerifier;
private final AuthService authService;
/** 실연동 전 기본 true — 'test-' 토큰으로 결제 흐름 테스트 가능 */
@Value("${billing.test-mode:true}")
private boolean testMode;
/** 구독 상품 카탈로그 (가격은 표시용 — 실제 금액은 Play Console 기준) */
private static final Map<String, ProductResponse> CATALOG = new LinkedHashMap<>();
static {
CATALOG.put("premium_monthly", new ProductResponse("premium_monthly", "프리미엄 월간", 1, 2900));
CATALOG.put("premium_yearly", new ProductResponse("premium_yearly", "프리미엄 연간", 12, 29000));
}
public List<ProductResponse> products() {
return List.copyOf(CATALOG.values());
}
/**
* Google Play 구매 검증 후 멤버십(PREMIUM) 부여/갱신.
* 같은 구매 토큰은 한 번만 처리(멱등). 세션 plan 도 즉시 동기화.
*/
@Transactional
public MembershipResponse verifyGoogle(Long memberId, String sessionToken, VerifyRequest req) {
ProductResponse product = CATALOG.get(req.getProductId());
if (product == null) {
throw new ApiException(HttpStatus.BAD_REQUEST, "알 수 없는 상품입니다.");
}
String token = req.getPurchaseToken();
// 이미 처리된 결제면 현재 상태 반환 (중복 지급 방지)
IapPurchase existing = purchaseMapper.findByToken(token);
if (existing != null) {
return MembershipResponse.of(mustFind(memberId));
}
boolean test = testMode || token.startsWith("test-");
String platform;
if (test) {
platform = "TEST";
} else {
platform = "GOOGLE_PLAY";
if (!googlePlayVerifier.verify(req.getProductId(), token)) {
throw new ApiException(HttpStatus.BAD_REQUEST, "결제 검증에 실패했습니다.");
}
}
// 기존 만료일이 미래면 그 시점부터 연장, 아니면 지금부터
Member member = mustFind(memberId);
LocalDateTime now = LocalDateTime.now();
LocalDateTime base = (member.getPlanExpiresAt() != null && member.getPlanExpiresAt().isAfter(now))
? member.getPlanExpiresAt() : now;
LocalDateTime expires = base.plusMonths(product.getMonths());
memberMapper.updateMembership(memberId, "PREMIUM", expires, req.getProductId(), true);
purchaseMapper.insert(IapPurchase.builder()
.memberId(memberId).platform(platform).productId(req.getProductId())
.purchaseToken(token).orderId(req.getOrderId())
.status("VERIFIED").expiresAt(expires).build());
authService.syncSessionPlan(sessionToken, "PREMIUM");
log.info("[billing] PREMIUM granted member={} product={} platform={} expires={}",
memberId, req.getProductId(), platform, expires);
member.setPlan("PREMIUM");
member.setPlanExpiresAt(expires);
return MembershipResponse.of(member);
}
/** 현재 구독 현황 */
public SubscriptionResponse getSubscription(Long memberId) {
return toSubscription(mustFind(memberId));
}
/**
* 구매 복원 — 기기 변경·재설치 시 최근 결제 기록 기준으로 멤버십을 복구한다.
* (실연동에서는 Google Play 의 활성 구매를 조회해 동기화하도록 교체)
*/
@Transactional
public SubscriptionResponse restore(Long memberId, String sessionToken) {
Member member = mustFind(memberId);
IapPurchase latest = purchaseMapper.findLatestByMember(memberId);
LocalDateTime now = LocalDateTime.now();
boolean stillValid = latest != null && latest.getExpiresAt() != null && latest.getExpiresAt().isAfter(now);
boolean needsRestore = !"PREMIUM".equals(member.getPlan())
|| member.getPlanExpiresAt() == null
|| member.getPlanExpiresAt().isBefore(latest != null && latest.getExpiresAt() != null ? latest.getExpiresAt() : now);
if (stillValid && needsRestore) {
memberMapper.updateMembership(memberId, "PREMIUM", latest.getExpiresAt(), latest.getProductId(), true);
authService.syncSessionPlan(sessionToken, "PREMIUM");
member.setPlan("PREMIUM");
member.setPlanExpiresAt(latest.getExpiresAt());
member.setPlanProduct(latest.getProductId());
member.setPlanAutoRenew(true);
log.info("[billing] 구매 복원 member={} expires={}", memberId, latest.getExpiresAt());
}
return toSubscription(member);
}
/** 구독 해지 — 자동 갱신만 끈다. 이용은 만료일까지 유지(이후 무료 전환). */
@Transactional
public SubscriptionResponse cancel(Long memberId) {
Member m = mustFind(memberId);
if (!"PREMIUM".equals(m.getPlan())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "구독 중이 아닙니다.");
}
memberMapper.updateAutoRenew(memberId, false);
m.setPlanAutoRenew(false);
log.info("[billing] subscription canceled member={} (이용 만료일까지 유지)", memberId);
return toSubscription(m);
}
/** 구독 재개 — 만료 전이면 자동 갱신을 다시 켠다. */
@Transactional
public SubscriptionResponse resume(Long memberId) {
Member m = mustFind(memberId);
if (!"PREMIUM".equals(m.getPlan())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "구독 중이 아닙니다.");
}
memberMapper.updateAutoRenew(memberId, true);
m.setPlanAutoRenew(true);
return toSubscription(m);
}
private SubscriptionResponse toSubscription(Member m) {
boolean premium = "PREMIUM".equals(m.getPlan());
boolean autoRenew = premium && Boolean.TRUE.equals(m.getPlanAutoRenew());
ProductResponse p = m.getPlanProduct() == null ? null : CATALOG.get(m.getPlanProduct());
String label = p != null ? p.getLabel() : (premium ? "프리미엄" : null);
return SubscriptionResponse.builder()
.premium(premium)
.planProduct(m.getPlanProduct())
.planLabel(label)
.expiresAt(m.getPlanExpiresAt())
.autoRenew(autoRenew)
.nextBillingAt(autoRenew ? m.getPlanExpiresAt() : null)
.build();
}
/**
* RTDN(실시간 개발자 알림) 처리 — 스캐폴드.
* 실연동: message.data(base64 JSON) 디코드 → subscriptionNotification 의 purchaseToken 으로
* Play Developer API 재조회 후 멤버십 동기화(갱신/해지/만료/환불).
*/
public void handleRtdn(Map<String, Object> body) {
try {
Object message = body == null ? null : body.get("message");
String data = null;
if (message instanceof Map<?, ?> m && m.get("data") != null) {
data = new String(java.util.Base64.getDecoder().decode(String.valueOf(m.get("data"))),
java.nio.charset.StandardCharsets.UTF_8);
}
log.info("[billing][rtdn] 수신 (스캐폴드 — 미처리): {}", data != null ? data : body);
} catch (Exception e) {
log.warn("[billing][rtdn] 파싱 실패: {}", e.toString());
}
// TODO(실연동): 구독 상태 변경(SUBSCRIPTION_RENEWED/CANCELED/EXPIRED/REVOKED) 반영
}
private Member mustFind(Long memberId) {
Member m = memberMapper.findById(memberId);
if (m == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다.");
}
return m;
}
}
@@ -1,11 +0,0 @@
package com.sb.web.billing;
/**
* Google Play 구매 토큰 검증 추상화.
* 실연동(androidpublisher API + 서비스 계정) 구현체로 교체하면 된다.
*/
public interface GooglePlayVerifier {
/** 구매 토큰이 유효하면 true. 검증 미구성/실패 시 예외 또는 false. */
boolean verify(String productId, String purchaseToken);
}
@@ -1,27 +0,0 @@
package com.sb.web.billing;
import com.sb.web.auth.mapper.MemberMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
* 만료된 유료 멤버십 자동 강등. 매시간 실행.
* (만료일이 NULL 인 관리자 영구 부여는 강등되지 않음)
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class PremiumExpiryScheduler {
private final MemberMapper memberMapper;
@Scheduled(cron = "0 5 * * * *") // 매시 5분
public void downgradeExpired() {
int n = memberMapper.downgradeExpired();
if (n > 0) {
log.info("[billing] 만료 멤버십 강등: {}건", n);
}
}
}
@@ -1,19 +0,0 @@
package com.sb.web.billing;
import com.sb.web.common.exception.ApiException;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
/**
* 실연동 전 스텁. 실제 Google Play 검증은 아직 구성되지 않았다.
* (테스트 모드에서는 BillingService 가 이 검증을 건너뛴다.)
*/
@Component
public class StubGooglePlayVerifier implements GooglePlayVerifier {
@Override
public boolean verify(String productId, String purchaseToken) {
throw new ApiException(HttpStatus.SERVICE_UNAVAILABLE,
"구글 결제 검증이 아직 구성되지 않았습니다. (테스트 모드로만 결제 가능)");
}
}
@@ -1,28 +0,0 @@
package com.sb.web.billing.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
* 인앱 결제 기록 (iap_purchase).
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class IapPurchase {
private Long id;
private Long memberId;
private String platform; // GOOGLE_PLAY / TEST
private String productId;
private String purchaseToken;
private String orderId;
private String status; // VERIFIED / FAILED
private LocalDateTime expiresAt;
private LocalDateTime createdAt;
}
@@ -1,24 +0,0 @@
package com.sb.web.billing.dto;
import com.sb.web.auth.domain.Member;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 결제 후 멤버십 상태.
*/
@Data
@AllArgsConstructor
public class MembershipResponse {
private String plan; // FREE / PREMIUM
private LocalDateTime planExpiresAt; // 만료일 (NULL=만료없음)
private boolean premium;
public static MembershipResponse of(Member m) {
boolean premium = "PREMIUM".equals(m.getPlan());
return new MembershipResponse(m.getPlan(), m.getPlanExpiresAt(), premium);
}
}
@@ -1,17 +0,0 @@
package com.sb.web.billing.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* 구독 상품 (업그레이드 화면 표시용).
*/
@Data
@AllArgsConstructor
public class ProductResponse {
private String id; // Google Play 상품 ID
private String label; // 표시 이름
private int months; // 부여 개월수
private int priceKrw; // 표시용 가격(원) — 실제 결제 금액은 Play Console 기준(스캐폴드 표시용)
}
@@ -1,21 +0,0 @@
package com.sb.web.billing.dto;
import lombok.Builder;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 정기결제(구독) 현황 — 계정정보 화면 표시용.
*/
@Data
@Builder
public class SubscriptionResponse {
private boolean premium; // 현재 유료 여부
private String planProduct; // 구독 상품 ID
private String planLabel; // 상품 표시 이름 (프리미엄 월간 등)
private LocalDateTime expiresAt; // 이용 만료일
private boolean autoRenew; // 자동 갱신 여부
private LocalDateTime nextBillingAt; // 다음 결제일 (자동 갱신 시 = 만료일, 해지 시 null)
}
@@ -1,20 +0,0 @@
package com.sb.web.billing.dto;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
/**
* Google Play 구매 검증 요청.
*/
@Data
public class VerifyRequest {
@NotBlank
private String productId;
/** Play 구매 토큰 (테스트는 'test-' 로 시작) */
@NotBlank
private String purchaseToken;
private String orderId;
}
@@ -1,20 +0,0 @@
package com.sb.web.billing.mapper;
import com.sb.web.billing.domain.IapPurchase;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 인앱 결제 기록 매퍼.
*/
@Mapper
public interface IapPurchaseMapper {
int insert(IapPurchase purchase);
/** 구매 토큰으로 기존 처리 여부 조회 (중복 결제 방지) */
IapPurchase findByToken(@Param("purchaseToken") String purchaseToken);
/** 회원의 가장 최근(만료일 먼) 결제 — 구매 복원용 */
IapPurchase findLatestByMember(@Param("memberId") Long memberId);
}
@@ -53,24 +53,6 @@ public class BoardController {
return boardService.list(page, size, category, tag, keyword, searchType);
}
/** 내 글 모아보기 */
@GetMapping("/my/posts")
public PageResponse<PostSummary> myPosts(
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return boardService.myPosts(current.getId(), page, size);
}
/** 내 댓글 모아보기 */
@GetMapping("/my/comments")
public PageResponse<com.sb.web.board.dto.MyCommentResponse> myComments(
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return boardService.myComments(current.getId(), page, size);
}
@GetMapping("/posts/{id}")
public PostDetail get(
@PathVariable Long id,
@@ -138,23 +120,15 @@ public class BoardController {
return ResponseEntity.noContent().build();
}
/** 목록 태그 필터 — 게시판 지정 시 그 게시판에 매핑된 그룹의 태그만 */
@GetMapping("/tags")
public List<String> tags(@RequestParam(required = false) String category) {
if (category == null || category.isBlank()) {
public List<String> tags() {
return boardService.allTags();
}
return tagService.listWritableGroups(category).stream()
.flatMap(g -> g.getTags().stream())
.map(com.sb.web.board.dto.TagResponse::getName)
.distinct()
.toList();
}
/** 글 작성 시 선택 가능한 태그 (해당 게시판에 매핑된 그룹만) */
/** 글 작성 시 선택 가능한 태그 (게시판 설정 카테고리로 제한) */
@GetMapping("/tag-groups")
public List<TagCategoryResponse> tagGroups(@RequestParam(required = false) String category) {
return tagService.listWritableGroups(category);
public List<TagCategoryResponse> tagGroups() {
return tagService.listWritableGroups();
}
@PostMapping("/posts/{id}/comments")
@@ -196,31 +170,4 @@ public class BoardController {
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
return boardService.voteComment(commentId, req.getType(), current);
}
/** 게시글 신고 (누적 5건 시 블라인드) */
@PostMapping("/posts/{id}/report")
public ResponseEntity<Void> reportPost(
@PathVariable Long id,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
boardService.reportPost(id, current);
return ResponseEntity.noContent().build();
}
/** 댓글 신고 (누적 5건 시 블라인드) */
@PostMapping("/comments/{commentId}/report")
public ResponseEntity<Void> reportComment(
@PathVariable Long commentId,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
boardService.reportComment(commentId, current);
return ResponseEntity.noContent().build();
}
/** 댓글 블라인드 해제 (관리자) */
@PostMapping("/comments/{commentId}/unblock")
public ResponseEntity<Void> unblockComment(
@PathVariable Long commentId,
@RequestAttribute(AuthInterceptor.CURRENT_MEMBER) SessionUser current) {
boardService.unblockComment(commentId, current);
return ResponseEntity.noContent().build();
}
}
@@ -24,6 +24,5 @@ public class Comment implements Serializable {
private String authorGooglePicture; // 조회 시 member JOIN (저장 안 함)
private String authorProfileImage; // 조회 시 member JOIN (저장 안 함)
private String content;
private Boolean blocked; // 신고 누적 블라인드
private LocalDateTime createdAt;
}
@@ -0,0 +1,11 @@
package com.sb.web.board.dto;
import lombok.Data;
/**
* 게시판 설정 변경 요청 — 사용할 태그 카테고리(null 이면 제한 없음).
*/
@Data
public class BoardSettingRequest {
private Long tagCategoryId;
}
@@ -0,0 +1,13 @@
package com.sb.web.board.dto;
import lombok.Builder;
import lombok.Data;
/**
* 게시판 설정 응답.
*/
@Data
@Builder
public class BoardSettingResponse {
private Long tagCategoryId;
}
@@ -23,8 +23,6 @@ public class CommentResponse {
private Integer upCount; // 추천 수
private Integer downCount; // 비추천 수
private String myVote; // 현재 사용자의 투표: UP / DOWN / null
private Boolean hot; // 인기 댓글(추천 50+ & 1일 이내) 상단 노출
private Boolean blocked; // 신고 누적 블라인드(관리자만 본문 열람)
public static CommentResponse from(Comment c) {
return CommentResponse.builder()
@@ -34,7 +32,6 @@ public class CommentResponse {
.authorGooglePicture(c.getAuthorGooglePicture())
.authorProfileImage(c.getAuthorProfileImage())
.content(c.getContent())
.blocked(Boolean.TRUE.equals(c.getBlocked()))
.createdAt(c.getCreatedAt())
.upCount(0)
.downCount(0)
@@ -1,19 +0,0 @@
package com.sb.web.board.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 내 댓글 모아보기 항목 (어느 글의 댓글인지 함께).
*/
@Data
public class MyCommentResponse {
private Long id;
private String content;
private LocalDateTime createdAt;
private Long postId;
private String postTitle;
private String category;
}
@@ -13,7 +13,6 @@ public class PostSummary {
private Long id;
private String title;
private String category; // 내 글 모아보기 등 교차 게시판 링크용
private Long authorId;
private String authorName;
private String authorGooglePicture;
@@ -21,8 +20,6 @@ public class PostSummary {
private Integer viewCount;
private Integer commentCount;
private Integer upCount; // 추천 수
private Integer downCount; // 비추천 수
private Boolean hot; // 인기 글(추천 50+ & 1일 이내) 상단 노출
private Boolean blocked;
private Boolean notice;
private LocalDateTime createdAt;
@@ -4,8 +4,6 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.util.List;
/**
* 태그 카테고리 생성/수정 요청.
*/
@@ -17,7 +15,4 @@ public class TagCategoryRequest {
private String name;
private Integer sortOrder;
/** 이 그룹을 사용할 게시판 (community/saving/tips). 비어있으면 전체 게시판. */
private List<String> boards;
}
@@ -17,15 +17,13 @@ public class TagCategoryResponse {
private String name;
private Integer sortOrder;
private List<TagResponse> tags;
private List<String> boards; // 이 그룹을 사용할 게시판 (비어있으면 전체)
public static TagCategoryResponse of(TagCategory c, List<TagResponse> tags, List<String> boards) {
public static TagCategoryResponse of(TagCategory c, List<TagResponse> tags) {
return TagCategoryResponse.builder()
.id(c.getId())
.name(c.getName())
.sortOrder(c.getSortOrder())
.tags(tags)
.boards(boards)
.build();
}
}
@@ -0,0 +1,13 @@
package com.sb.web.board.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface BoardSettingMapper {
/** 게시판에서 사용할 태그 카테고리 ID (없으면 null) */
Long findTagCategoryId();
int updateTagCategoryId(@Param("categoryId") Long categoryId);
}
@@ -18,13 +18,4 @@ public interface CommentMapper {
int delete(@Param("id") Long id);
int deleteByPostId(@Param("postId") Long postId);
/** 신고 누적 블라인드 설정 */
int updateBlocked(@Param("id") Long id, @Param("blocked") boolean blocked);
/** 내 댓글 모아보기 (글 제목·카테고리 포함) */
java.util.List<com.sb.web.board.dto.MyCommentResponse> findMyPage(
@Param("memberId") Long memberId, @Param("offset") int offset, @Param("size") int size);
long countMyComments(@Param("memberId") Long memberId);
}
@@ -22,18 +22,6 @@ public interface PostMapper {
@Param("keyword") String keyword,
@Param("searchType") String searchType);
/** 인기 글(추천 minUp 이상 & hours 시간 이내) 상단 노출용 — 추천 많은 순 limit 건 */
List<PostSummary> findHotPosts(@Param("category") String category,
@Param("hours") int hours,
@Param("minUp") int minUp,
@Param("limit") int limit);
/** 내 글 모아보기 */
List<PostSummary> findMyPage(@Param("memberId") Long memberId,
@Param("offset") int offset, @Param("size") int size);
long countMyPosts(@Param("memberId") Long memberId);
Post findById(@Param("id") Long id);
int insert(Post post);
@@ -1,23 +0,0 @@
package com.sb.web.board.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 신고(report) 매퍼 — 글/댓글 신고 누적 집계.
*/
@Mapper
public interface ReportMapper {
/** 신고 추가 (회원당 대상별 1회 — 중복은 무시) */
int insertIgnore(@Param("targetType") String targetType,
@Param("targetId") Long targetId,
@Param("memberId") Long memberId,
@Param("reason") String reason);
int countByTarget(@Param("targetType") String targetType, @Param("targetId") Long targetId);
int deleteByTarget(@Param("targetType") String targetType, @Param("targetId") Long targetId);
int deleteByMember(@Param("memberId") Long memberId);
}
@@ -1,20 +0,0 @@
package com.sb.web.board.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 태그 카테고리(그룹) ↔ 게시판 매핑 (tag_category_board).
*/
@Mapper
public interface TagCategoryBoardMapper {
/** 카테고리가 노출될 게시판 목록 */
List<String> findBoards(@Param("categoryId") Long categoryId);
void deleteByCategory(@Param("categoryId") Long categoryId);
void insert(@Param("categoryId") Long categoryId, @Param("board") String board);
}
@@ -14,7 +14,6 @@ import com.sb.web.board.dto.Recommender;
import com.sb.web.board.dto.VoteResponse;
import com.sb.web.board.mapper.CommentMapper;
import com.sb.web.board.mapper.PostMapper;
import com.sb.web.board.mapper.ReportMapper;
import com.sb.web.board.mapper.TagMapper;
import com.sb.web.board.mapper.VoteMapper;
import com.sb.web.common.exception.ApiException;
@@ -42,7 +41,6 @@ public class BoardService {
private final TagMapper tagMapper;
private final CommentMapper commentMapper;
private final VoteMapper voteMapper;
private final ReportMapper reportMapper;
private final PointService pointService;
private final RedisTemplate<String, Object> redisTemplate;
@@ -50,15 +48,6 @@ public class BoardService {
private static final Duration VIEW_DEDUP_TTL = Duration.ofHours(24);
private static final String UP = "UP";
private static final String DOWN = "DOWN";
private static final String T_POST = "POST";
private static final String T_COMMENT = "COMMENT";
/** 신고 누적 블라인드 임계 */
private static final int REPORT_BLIND_THRESHOLD = 5;
// 인기 글/댓글: 등록 1일 이내 + 추천 50건 이상이면 상단에 최대 3건 노출
private static final int HOT_WITHIN_HOURS = 24;
private static final int HOT_MIN_UP = 50;
private static final int HOT_MAX = 3;
/* ===================== 게시글 ===================== */
@@ -72,39 +61,9 @@ public class BoardService {
// 목록에는 태그를 표시하지 않으므로 게시글별 태그 조회를 생략한다.
List<PostSummary> content = postMapper.findPage(offset, s, cat, blankToNull(tag), blankToNull(keyword), st);
long total = postMapper.countPage(cat, blankToNull(tag), blankToNull(keyword), st);
// 1페이지·검색 없을 때만 인기 글을 최상단에 노출 (중복 제거)
if (p == 1 && blankToNull(tag) == null && blankToNull(keyword) == null) {
List<PostSummary> hot = postMapper.findHotPosts(cat, HOT_WITHIN_HOURS, HOT_MIN_UP, HOT_MAX);
if (!hot.isEmpty()) {
java.util.Set<Long> hotIds = new java.util.HashSet<>();
hot.forEach(h -> { h.setHot(true); hotIds.add(h.getId()); });
List<PostSummary> merged = new java.util.ArrayList<>(hot);
for (PostSummary ps : content) {
if (!hotIds.contains(ps.getId())) merged.add(ps);
}
content = merged;
}
}
return PageResponse.of(content, p, s, total);
}
/** 내 글 모아보기 */
public PageResponse<PostSummary> myPosts(Long memberId, int page, int size) {
int p = Math.max(page, 1);
int s = Math.min(Math.max(size, 1), 100);
List<PostSummary> content = postMapper.findMyPage(memberId, (p - 1) * s, s);
return PageResponse.of(content, p, s, postMapper.countMyPosts(memberId));
}
/** 내 댓글 모아보기 */
public PageResponse<com.sb.web.board.dto.MyCommentResponse> myComments(Long memberId, int page, int size) {
int p = Math.max(page, 1);
int s = Math.min(Math.max(size, 1), 100);
var content = commentMapper.findMyPage(memberId, (p - 1) * s, s);
return PageResponse.of(content, p, s, commentMapper.countMyComments(memberId));
}
private String normalizeSearchType(String t) {
return ("content".equals(t) || "comment".equals(t)) ? t : "title";
}
@@ -141,22 +100,6 @@ public class BoardService {
assertAdmin(user);
mustFindPost(id);
postMapper.updateBlocked(id, blocked, blocked ? reason : null);
// 해제 시 신고 기록 초기화 → 다음 신고 1건에 곧바로 재블라인드되지 않게
if (!blocked) {
reportMapper.deleteByTarget(T_POST, id);
}
}
/** 댓글 블라인드 해제 (관리자 전용) — 신고 기록 초기화 */
@Transactional
public void unblockComment(Long commentId, SessionUser user) {
assertAdmin(user);
Comment comment = commentMapper.findById(commentId);
if (comment == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "댓글을 찾을 수 없습니다.");
}
commentMapper.updateBlocked(commentId, false);
reportMapper.deleteByTarget(T_COMMENT, commentId);
}
/** 게시글 공지 설정/해제 (관리자 전용) — 목록 최상단 고정 */
@@ -223,7 +166,6 @@ public class BoardService {
// 투표 정리(댓글 투표는 댓글 삭제 전에 — 서브쿼리가 comment 참조)
voteMapper.deleteCommentVotesByPost(id);
voteMapper.deletePostVotesByPost(id);
reportMapper.deleteByTarget(T_POST, id);
tagMapper.deletePostTagsByPostId(id);
commentMapper.deleteByPostId(id);
postMapper.delete(id);
@@ -256,52 +198,15 @@ public class BoardService {
}
assertCanModify(comment.getAuthorId(), user);
voteMapper.deleteCommentVotesByComment(commentId);
reportMapper.deleteByTarget(T_COMMENT, commentId);
commentMapper.delete(commentId);
}
/* ===================== 신고 ===================== */
/** 게시글 신고 — 회원당 1회, 누적 5건이면 블라인드(관리자만 열람) */
@Transactional
public void reportPost(Long postId, SessionUser user) {
Post post = mustFindPost(postId);
if (post.getAuthorId().equals(user.getId())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "본인 글은 신고할 수 없습니다.");
}
reportMapper.insertIgnore(T_POST, postId, user.getId(), null);
if (!Boolean.TRUE.equals(post.getBlocked())
&& reportMapper.countByTarget(T_POST, postId) >= REPORT_BLIND_THRESHOLD) {
postMapper.updateBlocked(postId, true, "신고 누적으로 블라인드되었습니다.");
}
}
/** 댓글 신고 — 회원당 1회, 누적 5건이면 블라인드(관리자만 열람) */
@Transactional
public void reportComment(Long commentId, SessionUser user) {
Comment comment = commentMapper.findById(commentId);
if (comment == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "댓글을 찾을 수 없습니다.");
}
if (comment.getAuthorId().equals(user.getId())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "본인 댓글은 신고할 수 없습니다.");
}
reportMapper.insertIgnore(T_COMMENT, commentId, user.getId(), null);
if (!Boolean.TRUE.equals(comment.getBlocked())
&& reportMapper.countByTarget(T_COMMENT, commentId) >= REPORT_BLIND_THRESHOLD) {
commentMapper.updateBlocked(commentId, true);
}
}
/* ===================== 추천/비추천 ===================== */
/** 게시글 추천/비추천 토글. 같은 표 재요청 시 취소, 반대면 전환. */
@Transactional
public VoteResponse votePost(Long postId, String type, SessionUser user) {
Post post = mustFindPost(postId);
if (post.getAuthorId().equals(user.getId())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "본인 글에는 추천/비추천할 수 없습니다.");
}
mustFindPost(postId);
Long memberId = user.getId();
String existing = voteMapper.findPostVote(postId, memberId);
boolean cancel = type.equals(existing);
@@ -323,9 +228,6 @@ public class BoardService {
if (comment == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "댓글을 찾을 수 없습니다.");
}
if (comment.getAuthorId().equals(user.getId())) {
throw new ApiException(HttpStatus.BAD_REQUEST, "본인 댓글에는 추천/비추천할 수 없습니다.");
}
Long memberId = user.getId();
String existing = voteMapper.findCommentVote(commentId, memberId);
boolean cancel = type.equals(existing);
@@ -364,7 +266,7 @@ public class BoardService {
for (CommentVoteSummary s : voteMapper.findCommentVoteSummary(postId, viewerId)) {
voteByComment.put(s.getCommentId(), s);
}
List<CommentResponse> comments = new java.util.ArrayList<>(commentMapper.findByPostId(postId).stream().map(c -> {
List<CommentResponse> comments = commentMapper.findByPostId(postId).stream().map(c -> {
CommentResponse cr = CommentResponse.from(c);
CommentVoteSummary s = voteByComment.get(c.getId());
if (s != null) {
@@ -373,15 +275,7 @@ public class BoardService {
cr.setMyVote(s.getMyVote());
}
return cr;
}).toList());
// 신고 누적 블라인드 댓글: 관리자가 아니면 본문 숨김
boolean viewerAdmin = isAdmin(viewer);
if (!viewerAdmin) {
comments.forEach(cr -> {
if (Boolean.TRUE.equals(cr.getBlocked())) cr.setContent(null);
});
}
comments = orderWithHot(comments);
}).toList();
PostDetail detail = PostDetail.of(post, tags, comments);
detail.setUpCount(voteMapper.countPostVotes(postId, UP));
@@ -391,27 +285,6 @@ public class BoardService {
return detail;
}
/** 인기 댓글(추천 50+ & 1일 이내) 최대 3건을 추천 많은 순으로 상단에 올리고 hot 표시 */
private List<CommentResponse> orderWithHot(List<CommentResponse> comments) {
java.time.LocalDateTime cutoff = java.time.LocalDateTime.now().minusHours(HOT_WITHIN_HOURS);
List<CommentResponse> hot = comments.stream()
.filter(c -> c.getUpCount() != null && c.getUpCount() >= HOT_MIN_UP
&& c.getCreatedAt() != null && c.getCreatedAt().isAfter(cutoff))
.sorted((a, b) -> Integer.compare(b.getUpCount(), a.getUpCount()))
.limit(HOT_MAX)
.toList();
if (hot.isEmpty()) {
return comments;
}
java.util.Set<Long> hotIds = new java.util.HashSet<>();
hot.forEach(c -> { c.setHot(true); hotIds.add(c.getId()); });
List<CommentResponse> ordered = new java.util.ArrayList<>(hot);
for (CommentResponse c : comments) {
if (!hotIds.contains(c.getId())) ordered.add(c);
}
return ordered;
}
/** 선택된 태그 ID 중 실제 DB에 존재하는 것만 게시글에 연결 (신규 태그 생성 없음) */
private void applyTags(Long postId, List<Long> tagIds) {
if (tagIds == null || tagIds.isEmpty()) {
@@ -4,9 +4,10 @@ import com.sb.web.board.domain.Tag;
import com.sb.web.board.domain.TagCategory;
import com.sb.web.board.dto.TagCategoryRequest;
import com.sb.web.board.dto.TagCategoryResponse;
import com.sb.web.board.dto.BoardSettingResponse;
import com.sb.web.board.dto.TagRequest;
import com.sb.web.board.dto.TagResponse;
import com.sb.web.board.mapper.TagCategoryBoardMapper;
import com.sb.web.board.mapper.BoardSettingMapper;
import com.sb.web.board.mapper.TagCategoryMapper;
import com.sb.web.board.mapper.TagMapper;
import com.sb.web.common.exception.ApiException;
@@ -17,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* 태그 카테고리 + 태그 관리 서비스 (관리자 기능 + 그룹 조회).
@@ -28,10 +28,7 @@ public class TagService {
private final TagCategoryMapper categoryMapper;
private final TagMapper tagMapper;
private final TagCategoryBoardMapper categoryBoardMapper;
/** 게시판 매핑에 허용되는 값 */
private static final Set<String> VALID_BOARDS = Set.of("community", "saving", "tips");
private final BoardSettingMapper boardSettingMapper;
/** 카테고리별로 묶은 전체 태그 (관리 화면용) */
public List<TagCategoryResponse> listGrouped() {
@@ -42,43 +39,37 @@ public class TagService {
return result;
}
/**
* 글 작성 시 선택 가능한 태그 그룹 — 해당 게시판에 명시적으로 매핑된 그룹만(엄격).
* 게시판을 하나도 지정하지 않은 그룹은 어디에도 노출되지 않는다.
*/
public List<TagCategoryResponse> listWritableGroups(String boardCategory) {
// 게시판 미지정(수정 화면 등) → 전체 그룹 (기존 글 태그 유실 방지)
if (boardCategory == null || boardCategory.isBlank()) {
/** 글 작성 시 선택 가능한 태그 그룹 — 게시판 설정 카테고리로 제한 (없으면 전체) */
public List<TagCategoryResponse> listWritableGroups() {
Long catId = boardSettingMapper.findTagCategoryId();
if (catId == null) {
return listGrouped();
}
List<TagCategoryResponse> result = new ArrayList<>();
for (TagCategory c : categoryMapper.findAll()) {
TagCategoryResponse g = toGroup(c);
List<String> boards = g.getBoards();
if (boards != null && boards.contains(boardCategory)) {
result.add(g);
}
}
return result;
TagCategory c = categoryMapper.findById(catId);
return c == null ? listGrouped() : List.of(toGroup(c));
}
private TagCategoryResponse toGroup(TagCategory c) {
List<TagResponse> tags = tagMapper.findByCategoryId(c.getId())
.stream().map(TagResponse::from).toList();
List<String> boards = categoryBoardMapper.findBoards(c.getId());
return TagCategoryResponse.of(c, tags, boards);
return TagCategoryResponse.of(c, tags);
}
/** 카테고리의 게시판 매핑을 교체 저장 (유효 게시판 값만, 중복 제거) */
private void saveBoards(Long categoryId, List<String> boards) {
categoryBoardMapper.deleteByCategory(categoryId);
if (boards == null) {
return;
/* ===================== 게시판 설정 ===================== */
public BoardSettingResponse getBoardSetting() {
return BoardSettingResponse.builder()
.tagCategoryId(boardSettingMapper.findTagCategoryId())
.build();
}
boards.stream()
.filter(b -> b != null && VALID_BOARDS.contains(b))
.distinct()
.forEach(b -> categoryBoardMapper.insert(categoryId, b));
@Transactional
public BoardSettingResponse setBoardSetting(Long tagCategoryId) {
if (tagCategoryId != null && categoryMapper.findById(tagCategoryId) == null) {
throw new ApiException(HttpStatus.NOT_FOUND, "카테고리를 찾을 수 없습니다.");
}
boardSettingMapper.updateTagCategoryId(tagCategoryId);
return BoardSettingResponse.builder().tagCategoryId(tagCategoryId).build();
}
/* ===================== 카테고리 ===================== */
@@ -94,8 +85,7 @@ public class TagService {
.sortOrder(req.getSortOrder() != null ? req.getSortOrder() : 0)
.build();
categoryMapper.insert(c);
saveBoards(c.getId(), req.getBoards());
return TagCategoryResponse.of(c, List.of(), categoryBoardMapper.findBoards(c.getId()));
return TagCategoryResponse.of(c, List.of());
}
@Transactional
@@ -110,12 +100,11 @@ public class TagService {
c.setSortOrder(req.getSortOrder());
}
categoryMapper.update(c);
saveBoards(id, req.getBoards());
List<TagResponse> tags = tagMapper.findByCategoryId(id).stream().map(TagResponse::from).toList();
return TagCategoryResponse.of(c, tags, categoryBoardMapper.findBoards(id));
return TagCategoryResponse.of(c, tags);
}
/** 카테고리 삭제 — 소속 태그와 그 연결(post_tag)·게시판 매핑까지 함께 삭제 */
/** 카테고리 삭제 — 소속 태그와 그 연결(post_tag)까지 함께 삭제 */
@Transactional
public void deleteCategory(Long id) {
mustFindCategory(id);
@@ -123,7 +112,6 @@ public class TagService {
tagMapper.deletePostTagsByTagId(t.getId());
tagMapper.delete(t.getId());
}
categoryBoardMapper.deleteByCategory(id);
categoryMapper.delete(id);
}
@@ -25,12 +25,9 @@ public class WebConfig implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry registry) {
// 인증: 로그인 필요한 경로 (관리자 경로 포함 SessionUser 세팅용으로 먼저 실행)
registry.addInterceptor(authInterceptor)
.addPathPatterns("/api/auth/me", "/api/auth/points", "/api/auth/point-history",
"/api/auth/logout", "/api/auth/password",
.addPathPatterns("/api/auth/me", "/api/auth/points", "/api/auth/logout", "/api/auth/password",
"/api/auth/verify-password", "/api/auth/profile", "/api/auth/profile-image",
"/api/board/**", "/api/admin/**", "/api/account/**", "/api/billing/**", "/api/fx/**")
// Google Play RTDN(서버 알림) 비인증 Google 호출
.excludePathPatterns("/api/billing/google/rtdn");
"/api/board/**", "/api/admin/**", "/api/account/**");
// 인가: 관리자 전용 경로 (authInterceptor 다음에 실행되어 role 검사)
registry.addInterceptor(adminInterceptor)
.addPathPatterns("/api/admin/**");
@@ -1,16 +0,0 @@
package com.sb.web.point;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 포인트 적립/차감 내역 항목.
*/
@Data
public class PointHistoryResponse {
private Integer amount; // 증감 포인트(+/-)
private String reason; // BOARD_WRITE
private LocalDateTime createdAt;
}
@@ -38,9 +38,4 @@ public class PointService {
Long p = pointMapper.getPoints(memberId);
return p == null ? 0L : p;
}
/** 최근 포인트 적립/차감 내역 (최신순) */
public java.util.List<PointHistoryResponse> getHistory(Long memberId) {
return pointMapper.findHistory(memberId, 100);
}
}
@@ -1,11 +1,8 @@
package com.sb.web.point.mapper;
import com.sb.web.point.PointHistoryResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 포인트(member.points) 적립 이력(point_history) 매퍼.
*/
@@ -20,7 +17,4 @@ public interface PointMapper {
int addPoints(@Param("memberId") Long memberId, @Param("amount") int amount);
Long getPoints(@Param("memberId") Long memberId);
/** 최근 적립/차감 내역 (최신순, 최대 limit건) */
List<PointHistoryResponse> findHistory(@Param("memberId") Long memberId, @Param("limit") int limit);
}
-18
View File
@@ -28,11 +28,6 @@ ALTER TABLE wallet ADD COLUMN IF NOT EXISTS opening_balance BIGINT NOT NULL DEFA
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS opening_date DATE NULL;
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS current_value BIGINT NULL;
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS sort_order INT NOT NULL DEFAULT 0;
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_rate DECIMAL(7,4) NULL COMMENT '연이자율(%) 예: 5.2500';
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_method VARCHAR(20) NULL COMMENT '상환방식: EQUAL_PAYMENT/EQUAL_PRINCIPAL/BULLET';
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_months INT NULL COMMENT '대출기간(개월)';
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_start DATE NULL COMMENT '대출시작일';
ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_amount BIGINT NULL COMMENT '대출 실행 금액(원금, 처음 빌린 금액)';
-- 계좌번호 암호화 저장(AES-GCM)으로 평문보다 길어 VARCHAR(255) 필요 — 운영 적용 완료(CREATE TABLE 정의에 반영).
-- 매 기동 MODIFY 는 라이브 테이블 락 위험이 있어 제거. 기존 환경 확장이 필요하면 1회 수동 적용:
-- ALTER TABLE wallet MODIFY account_number VARCHAR(255) NULL;
@@ -64,10 +59,6 @@ ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS installment_months INT NULL;
ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS pending TINYINT(1) NOT NULL DEFAULT 0 COMMENT '확인 필요(미확정) 여부';
ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS notif_key VARCHAR(160) NULL COMMENT '알림 자동인식 중복방지 키';
ALTER TABLE account_entry ADD INDEX IF NOT EXISTS idx_entry_notif (member_id, notif_key);
-- 외화 결제: amount 는 환산된 원화(표준값, 통계·예산은 이 값 사용). 아래는 외화 원본 보존용.
ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS currency VARCHAR(3) NULL COMMENT '통화코드(USD/JPY 등). NULL/KRW=원화';
ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS original_amount DECIMAL(18,2) NULL COMMENT '외화 원본 금액';
ALTER TABLE account_entry ADD COLUMN IF NOT EXISTS exchange_rate DECIMAL(18,6) NULL COMMENT '적용 환율(외화 1단위→원화)';
-- 가계부 태그 (사용자별 관리 — 게시판 태그와 분리)
CREATE TABLE IF NOT EXISTS account_tag (
@@ -170,15 +161,6 @@ CREATE TABLE IF NOT EXISTS budget (
UNIQUE KEY uk_budget_member_category (member_id, category)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 월별 예산: 예산을 연/월별로 분리(전월 복사로 다음 달에 동일 예산 저장 가능).
ALTER TABLE budget ADD COLUMN IF NOT EXISTS `year` INT NULL COMMENT '예산 연도';
ALTER TABLE budget ADD COLUMN IF NOT EXISTS `month` INT NULL COMMENT '예산 월(1~12)';
-- 기존 상시 예산을 현재 연/월로 1회 이관
UPDATE budget SET `year` = YEAR(NOW()), `month` = MONTH(NOW()) WHERE `year` IS NULL OR `month` IS NULL;
-- 분류 유니크를 (member,category) → (member,category,year,month) 로 교체
ALTER TABLE budget DROP INDEX IF EXISTS uk_budget_member_category;
ALTER TABLE budget ADD UNIQUE KEY IF NOT EXISTS uk_budget_member_cat_ym (member_id, category, `year`, `month`);
-- 가계부 항목 - 태그 (다대다, tag_id 는 account_tag.id 참조)
CREATE TABLE IF NOT EXISTS account_entry_tag (
entry_id BIGINT NOT NULL,
+10 -25
View File
@@ -54,15 +54,6 @@ CREATE TABLE IF NOT EXISTS tag (
-- 기존 tag 테이블에 category_id 가 없으면 추가 (멱등)
ALTER TABLE tag ADD COLUMN IF NOT EXISTS category_id BIGINT NULL;
-- 태그 카테고리(그룹) ↔ 게시판 매핑. 어느 게시판(community/saving/tips)에서 이 그룹을 쓸지 지정.
-- 매핑이 하나도 없는 카테고리는 모든 게시판에서 사용(하위호환).
CREATE TABLE IF NOT EXISTS tag_category_board (
tag_category_id BIGINT NOT NULL,
board_category VARCHAR(30) NOT NULL COMMENT 'community / saving / tips',
PRIMARY KEY (tag_category_id, board_category),
KEY idx_tcb_board (board_category)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 게시글-태그 (다대다)
CREATE TABLE IF NOT EXISTS post_tag (
post_id BIGINT NOT NULL,
@@ -71,6 +62,16 @@ CREATE TABLE IF NOT EXISTS post_tag (
KEY idx_post_tag_tag (tag_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 게시판 설정 (단일 행) — 게시판에서 사용할 태그 카테고리 지정
CREATE TABLE IF NOT EXISTS board_setting (
id BIGINT NOT NULL,
tag_category_id BIGINT NULL COMMENT '이 게시판에서 사용 가능한 태그 카테고리',
updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
INSERT IGNORE INTO board_setting (id, tag_category_id) VALUES (1, NULL);
-- 게시글 인라인 이미지 (DB 저장). 본문에는 /api/images/{id} URL 만 포함(base64 미사용).
CREATE TABLE IF NOT EXISTS board_image (
id BIGINT NOT NULL AUTO_INCREMENT,
@@ -95,22 +96,6 @@ CREATE TABLE IF NOT EXISTS comment (
KEY idx_comment_post (post_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 댓글 신고 누적 블라인드 플래그 (멱등)
ALTER TABLE comment ADD COLUMN IF NOT EXISTS blocked TINYINT(1) NOT NULL DEFAULT 0 COMMENT '신고 누적 블라인드';
-- 신고 (글/댓글). 회원당 대상별 1회. 5건 누적 시 블라인드(관리자만 열람).
CREATE TABLE IF NOT EXISTS report (
id BIGINT NOT NULL AUTO_INCREMENT,
target_type VARCHAR(10) NOT NULL COMMENT 'POST / COMMENT',
target_id BIGINT NOT NULL,
member_id BIGINT NOT NULL COMMENT '신고자',
reason VARCHAR(255) NULL,
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
UNIQUE KEY uk_report (target_type, target_id, member_id),
KEY idx_report_target (target_type, target_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 게시글 추천/비추천 (회원당 1표, UP/DOWN). 같은 표 재요청 시 취소, 반대면 전환.
CREATE TABLE IF NOT EXISTS post_vote (
post_id BIGINT NOT NULL,
-23
View File
@@ -38,29 +38,6 @@ ALTER TABLE member ADD COLUMN IF NOT EXISTS profile_image MEDIUMTEXT NULL COMMEN
-- 포인트(게시판 글/댓글 작성 보상). 기존 회원은 0 으로 시작 (멱등).
ALTER TABLE member ADD COLUMN IF NOT EXISTS points BIGINT NOT NULL DEFAULT 0 COMMENT '활동 포인트' AFTER plan;
-- 멤버십 만료일 (유료 구독). NULL = 만료 없음(관리자 영구 부여) 또는 무료. 만료 지나면 스케줄러가 FREE 로 강등.
ALTER TABLE member ADD COLUMN IF NOT EXISTS plan_expires_at DATETIME NULL COMMENT '유료 멤버십 만료일시' AFTER plan;
-- 구독 상품(premium_monthly 등) + 자동 갱신 여부 (정기결제 관리)
ALTER TABLE member ADD COLUMN IF NOT EXISTS plan_product VARCHAR(100) NULL COMMENT '구독 상품 ID' AFTER plan_expires_at;
ALTER TABLE member ADD COLUMN IF NOT EXISTS plan_auto_renew TINYINT(1) NOT NULL DEFAULT 0 COMMENT '자동 갱신(해지 시 0)' AFTER plan_product;
-- 인앱 결제 기록 (영수증 검증·중복 방지·감사)
CREATE TABLE IF NOT EXISTS iap_purchase (
id BIGINT NOT NULL AUTO_INCREMENT,
member_id BIGINT NOT NULL,
platform VARCHAR(20) NOT NULL COMMENT 'GOOGLE_PLAY / TEST',
product_id VARCHAR(100) NOT NULL COMMENT '상품 ID(premium_monthly 등)',
purchase_token VARCHAR(512) NOT NULL COMMENT 'Play 구매 토큰(또는 테스트 토큰)',
order_id VARCHAR(120) NULL,
status VARCHAR(20) NOT NULL COMMENT 'VERIFIED / FAILED',
expires_at DATETIME NULL COMMENT '이 결제로 부여된 만료일',
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
UNIQUE KEY uk_iap_token (purchase_token),
KEY idx_iap_member (member_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 포인트 적립/차감 이력 (감사 + 일일 지급 한도 계산용).
CREATE TABLE IF NOT EXISTS point_history (
id BIGINT NOT NULL AUTO_INCREMENT,
@@ -18,9 +18,6 @@
<result property="installmentMonths" column="installment_months"/>
<result property="pending" column="pending"/>
<result property="notifKey" column="notif_key"/>
<result property="currency" column="currency"/>
<result property="originalAmount" column="original_amount"/>
<result property="exchangeRate" column="exchange_rate"/>
<result property="createdAt" column="created_at"/>
<result property="updatedAt" column="updated_at"/>
</resultMap>
@@ -35,7 +32,6 @@
e.wallet_id, w.name AS wallet_name,
e.to_wallet_id, tw.name AS to_wallet_name,
e.installment_months, e.pending, e.notif_key,
e.currency, e.original_amount, e.exchange_rate,
e.created_at, e.updated_at
</sql>
<sql id="entryJoins">
@@ -145,20 +141,17 @@
useGeneratedKeys="true" keyProperty="id">
INSERT INTO account_entry (member_id, entry_date, type, category, amount, memo,
wallet_id, to_wallet_id, installment_months, pending, notif_key,
currency, original_amount, exchange_rate,
created_at, updated_at)
VALUES (#{memberId}, #{entryDate}, #{type}, #{category}, #{amount}, #{memo},
#{walletId}, #{toWalletId}, #{installmentMonths},
COALESCE(#{pending}, 0), #{notifKey},
#{currency}, #{originalAmount}, #{exchangeRate}, NOW(), NOW())
COALESCE(#{pending}, 0), #{notifKey}, NOW(), NOW())
</insert>
<update id="update" parameterType="com.sb.web.account.domain.AccountEntry">
UPDATE account_entry
SET entry_date = #{entryDate}, type = #{type}, category = #{category},
amount = #{amount}, memo = #{memo}, wallet_id = #{walletId}, to_wallet_id = #{toWalletId},
installment_months = #{installmentMonths},
currency = #{currency}, original_amount = #{originalAmount}, exchange_rate = #{exchangeRate}
installment_months = #{installmentMonths}
WHERE id = #{id} AND member_id = #{memberId}
</update>
@@ -27,10 +27,6 @@
UPDATE auth_session SET name = #{name} WHERE token = #{token}
</update>
<update id="updatePlan">
UPDATE auth_session SET plan = #{plan} WHERE token = #{token}
</update>
<delete id="delete">
DELETE FROM auth_session WHERE token = #{token}
</delete>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sb.web.board.mapper.BoardSettingMapper">
<select id="findTagCategoryId" resultType="java.lang.Long">
SELECT tag_category_id FROM board_setting WHERE id = 1
</select>
<update id="updateTagCategoryId">
UPDATE board_setting SET tag_category_id = #{categoryId} WHERE id = 1
</update>
</mapper>
+5 -24
View File
@@ -14,19 +14,15 @@
<result property="weekly" column="weekly"/>
<result property="monthly" column="monthly"/>
<result property="yearly" column="yearly"/>
<result property="year" column="year"/>
<result property="month" column="month"/>
<result property="createdAt" column="created_at"/>
<result property="updatedAt" column="updated_at"/>
</resultMap>
<sql id="cols">id, member_id, category, fixed, base_unit, base_amount,
daily, weekly, monthly, yearly, `year`, `month`, created_at, updated_at</sql>
daily, weekly, monthly, yearly, created_at, updated_at</sql>
<select id="findByMember" resultMap="budgetResultMap">
SELECT <include refid="cols"/> FROM budget
WHERE member_id = #{memberId} AND `year` = #{year} AND `month` = #{month}
ORDER BY category
<select id="findByMember" parameterType="long" resultMap="budgetResultMap">
SELECT <include refid="cols"/> FROM budget WHERE member_id = #{memberId} ORDER BY category
</select>
<select id="findByIdAndMember" resultMap="budgetResultMap">
@@ -36,30 +32,15 @@
<select id="countByCategory" resultType="int">
SELECT COUNT(*) FROM budget
WHERE member_id = #{memberId} AND category = #{category}
AND `year` = #{year} AND `month` = #{month}
<if test="excludeId != null">AND id != #{excludeId}</if>
</select>
<insert id="insert" parameterType="com.sb.web.account.domain.Budget"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO budget (member_id, category, fixed, base_unit, base_amount,
daily, weekly, monthly, yearly, `year`, `month`, created_at, updated_at)
daily, weekly, monthly, yearly, created_at, updated_at)
VALUES (#{memberId}, #{category}, #{fixed}, #{baseUnit}, #{baseAmount},
#{daily}, #{weekly}, #{monthly}, #{yearly}, #{year}, #{month}, NOW(), NOW())
</insert>
<!-- 전월(또는 임의 월) 예산을 다른 월로 복사. 같은 분류는 덮어씀(ON DUPLICATE) -->
<insert id="copyMonth">
INSERT INTO budget (member_id, category, fixed, base_unit, base_amount,
daily, weekly, monthly, yearly, `year`, `month`, created_at, updated_at)
SELECT member_id, category, fixed, base_unit, base_amount,
daily, weekly, monthly, yearly, #{toYear}, #{toMonth}, NOW(), NOW()
FROM budget
WHERE member_id = #{memberId} AND `year` = #{fromYear} AND `month` = #{fromMonth}
ON DUPLICATE KEY UPDATE
fixed = VALUES(fixed), base_unit = VALUES(base_unit), base_amount = VALUES(base_amount),
daily = VALUES(daily), weekly = VALUES(weekly), monthly = VALUES(monthly),
yearly = VALUES(yearly), updated_at = NOW()
#{daily}, #{weekly}, #{monthly}, #{yearly}, NOW(), NOW())
</insert>
<update id="update" parameterType="com.sb.web.account.domain.Budget">
+2 -20
View File
@@ -11,12 +11,11 @@
<result property="authorGooglePicture" column="author_google_picture"/>
<result property="authorProfileImage" column="author_profile_image"/>
<result property="content" column="content"/>
<result property="blocked" column="blocked"/>
<result property="createdAt" column="created_at"/>
</resultMap>
<select id="findByPostId" parameterType="long" resultMap="commentResultMap">
SELECT c.id, c.post_id, c.author_id, c.author_name, c.content, c.blocked, c.created_at,
SELECT c.id, c.post_id, c.author_id, c.author_name, c.content, c.created_at,
m.google_picture AS author_google_picture, m.profile_image AS author_profile_image
FROM comment c
LEFT JOIN member m ON m.id = c.author_id
@@ -25,30 +24,13 @@
</select>
<select id="findById" parameterType="long" resultMap="commentResultMap">
SELECT c.id, c.post_id, c.author_id, c.author_name, c.content, c.blocked, c.created_at,
SELECT c.id, c.post_id, c.author_id, c.author_name, c.content, c.created_at,
m.google_picture AS author_google_picture, m.profile_image AS author_profile_image
FROM comment c
LEFT JOIN member m ON m.id = c.author_id
WHERE c.id = #{id}
</select>
<update id="updateBlocked">
UPDATE comment SET blocked = #{blocked} WHERE id = #{id}
</update>
<select id="findMyPage" resultType="com.sb.web.board.dto.MyCommentResponse">
SELECT c.id, c.content, c.created_at, p.id AS post_id, p.title AS post_title, p.category
FROM comment c
JOIN post p ON p.id = c.post_id
WHERE c.author_id = #{memberId}
ORDER BY c.id DESC
LIMIT #{size} OFFSET #{offset}
</select>
<select id="countMyComments" parameterType="long" resultType="long">
SELECT COUNT(*) FROM comment WHERE author_id = #{memberId}
</select>
<insert id="insert" parameterType="com.sb.web.board.domain.Comment"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO comment (post_id, author_id, author_name, content, created_at)
@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sb.web.billing.mapper.IapPurchaseMapper">
<resultMap id="iapResultMap" type="com.sb.web.billing.domain.IapPurchase">
<id property="id" column="id"/>
<result property="memberId" column="member_id"/>
<result property="platform" column="platform"/>
<result property="productId" column="product_id"/>
<result property="purchaseToken" column="purchase_token"/>
<result property="orderId" column="order_id"/>
<result property="status" column="status"/>
<result property="expiresAt" column="expires_at"/>
<result property="createdAt" column="created_at"/>
</resultMap>
<insert id="insert" parameterType="com.sb.web.billing.domain.IapPurchase"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO iap_purchase (member_id, platform, product_id, purchase_token, order_id, status, expires_at, created_at)
VALUES (#{memberId}, #{platform}, #{productId}, #{purchaseToken}, #{orderId}, #{status}, #{expiresAt}, NOW())
</insert>
<select id="findByToken" resultMap="iapResultMap">
SELECT id, member_id, platform, product_id, purchase_token, order_id, status, expires_at, created_at
FROM iap_purchase WHERE purchase_token = #{purchaseToken}
</select>
<select id="findLatestByMember" parameterType="long" resultMap="iapResultMap">
SELECT id, member_id, platform, product_id, purchase_token, order_id, status, expires_at, created_at
FROM iap_purchase
WHERE member_id = #{memberId} AND status = 'VERIFIED'
ORDER BY expires_at DESC, id DESC
LIMIT 1
</select>
</mapper>
+2 -26
View File
@@ -16,9 +16,6 @@
<result property="profileImage" column="profile_image"/>
<result property="role" column="role"/>
<result property="plan" column="plan"/>
<result property="planExpiresAt" column="plan_expires_at"/>
<result property="planProduct" column="plan_product"/>
<result property="planAutoRenew" column="plan_auto_renew"/>
<result property="points" column="points"/>
<result property="status" column="status"/>
<result property="createdAt" column="created_at"/>
@@ -26,7 +23,7 @@
</resultMap>
<sql id="columns">
id, login_id, password, name, email, provider, provider_id, google_id, google_picture, profile_image, role, plan, plan_expires_at, plan_product, plan_auto_renew, points, status, created_at, updated_at
id, login_id, password, name, email, provider, provider_id, google_id, google_picture, profile_image, role, plan, points, status, created_at, updated_at
</sql>
<select id="findById" parameterType="long" resultMap="memberResultMap">
@@ -99,29 +96,8 @@
UPDATE member SET role = #{role}, updated_at = NOW() WHERE id = #{id}
</update>
<!-- 관리자 수동 변경: 만료일/구독정보 없이(영구) 설정/해제 -->
<update id="updatePlan">
UPDATE member SET plan = #{plan}, plan_expires_at = NULL, plan_product = NULL, plan_auto_renew = 0,
updated_at = NOW() WHERE id = #{id}
</update>
<!-- 결제로 멤버십 부여/갱신: plan + 만료일 + 구독상품 + 자동갱신 -->
<update id="updateMembership">
UPDATE member SET plan = #{plan}, plan_expires_at = #{expiresAt},
plan_product = #{product}, plan_auto_renew = #{autoRenew}, updated_at = NOW()
WHERE id = #{id}
</update>
<!-- 구독 해지/재개: 자동 갱신 플래그만 변경 (이용은 만료일까지 유지) -->
<update id="updateAutoRenew">
UPDATE member SET plan_auto_renew = #{autoRenew}, updated_at = NOW() WHERE id = #{id}
</update>
<!-- 만료된 '해지(자동갱신 off)' 유료회원만 강등 (자동갱신 건은 마켓 갱신/RTDN 이 관리) -->
<update id="downgradeExpired">
UPDATE member SET plan = 'FREE', plan_product = NULL, plan_auto_renew = 0, updated_at = NOW()
WHERE plan = 'PREMIUM' AND plan_auto_renew = 0
AND plan_expires_at IS NOT NULL AND plan_expires_at &lt; NOW()
UPDATE member SET plan = #{plan}, updated_at = NOW() WHERE id = #{id}
</update>
<update id="updateStatus">
@@ -21,12 +21,4 @@
SELECT points FROM member WHERE id = #{memberId}
</select>
<select id="findHistory" resultType="com.sb.web.point.PointHistoryResponse">
SELECT amount, reason, created_at
FROM point_history
WHERE member_id = #{memberId}
ORDER BY id DESC
LIMIT #{limit}
</select>
</mapper>
+1 -39
View File
@@ -38,8 +38,7 @@
p.id, p.title, p.author_id, p.author_name, p.view_count, p.blocked, p.notice, p.created_at,
m.google_picture AS author_google_picture, m.profile_image AS author_profile_image,
(SELECT COUNT(*) FROM comment c WHERE c.post_id = p.id) AS comment_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') AS up_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'DOWN') AS down_count
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') AS up_count
FROM post p
LEFT JOIN member m ON m.id = p.author_id
<include refid="filter"/>
@@ -47,49 +46,12 @@
LIMIT #{size} OFFSET #{offset}
</select>
<!-- 인기 글: 등록 #{hours}시간 이내 + 추천 #{minUp}건 이상, 추천 많은 순 #{limit}건 (상단 노출용) -->
<select id="findHotPosts" resultType="com.sb.web.board.dto.PostSummary">
SELECT
p.id, p.title, p.author_id, p.author_name, p.view_count, p.blocked, p.notice, p.created_at,
m.google_picture AS author_google_picture, m.profile_image AS author_profile_image,
(SELECT COUNT(*) FROM comment c WHERE c.post_id = p.id) AS comment_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') AS up_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'DOWN') AS down_count
FROM post p
LEFT JOIN member m ON m.id = p.author_id
WHERE p.notice = 0
AND (#{category} IS NULL OR p.category = #{category})
AND p.created_at >= NOW() - INTERVAL #{hours} HOUR
AND (SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') >= #{minUp}
ORDER BY (SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') DESC, p.id DESC
LIMIT #{limit}
</select>
<select id="countPage" resultType="long">
SELECT COUNT(*)
FROM post p
<include refid="filter"/>
</select>
<!-- 내 글 모아보기 -->
<select id="findMyPage" resultType="com.sb.web.board.dto.PostSummary">
SELECT
p.id, p.title, p.category, p.author_id, p.author_name, p.view_count, p.blocked, p.notice, p.created_at,
m.google_picture AS author_google_picture, m.profile_image AS author_profile_image,
(SELECT COUNT(*) FROM comment c WHERE c.post_id = p.id) AS comment_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'UP') AS up_count,
(SELECT COUNT(*) FROM post_vote v WHERE v.post_id = p.id AND v.vote_type = 'DOWN') AS down_count
FROM post p
LEFT JOIN member m ON m.id = p.author_id
WHERE p.author_id = #{memberId}
ORDER BY p.id DESC
LIMIT #{size} OFFSET #{offset}
</select>
<select id="countMyPosts" parameterType="long" resultType="long">
SELECT COUNT(*) FROM post WHERE author_id = #{memberId}
</select>
<select id="findById" parameterType="long" resultType="com.sb.web.board.domain.Post">
SELECT p.id, p.title, p.content, p.author_id, p.author_name, p.view_count,
p.blocked, p.block_reason, p.notice, p.category, p.created_at, p.updated_at,
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sb.web.board.mapper.ReportMapper">
<insert id="insertIgnore">
INSERT IGNORE INTO report (target_type, target_id, member_id, reason, created_at)
VALUES (#{targetType}, #{targetId}, #{memberId}, #{reason}, NOW())
</insert>
<select id="countByTarget" resultType="int">
SELECT COUNT(*) FROM report WHERE target_type = #{targetType} AND target_id = #{targetId}
</select>
<delete id="deleteByTarget">
DELETE FROM report WHERE target_type = #{targetType} AND target_id = #{targetId}
</delete>
<delete id="deleteByMember">
DELETE FROM report WHERE member_id = #{memberId}
</delete>
</mapper>
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sb.web.board.mapper.TagCategoryBoardMapper">
<select id="findBoards" parameterType="long" resultType="string">
SELECT board_category FROM tag_category_board WHERE tag_category_id = #{categoryId}
</select>
<delete id="deleteByCategory" parameterType="long">
DELETE FROM tag_category_board WHERE tag_category_id = #{categoryId}
</delete>
<insert id="insert">
INSERT INTO tag_category_board (tag_category_id, board_category)
VALUES (#{categoryId}, #{board})
</insert>
</mapper>
+4 -18
View File
@@ -15,20 +15,13 @@
<result property="openingBalance" column="opening_balance"/>
<result property="openingDate" column="opening_date"/>
<result property="currentValue" column="current_value"/>
<result property="loanAmount" column="loan_amount"/>
<result property="loanRate" column="loan_rate"/>
<result property="loanMethod" column="loan_method"/>
<result property="loanMonths" column="loan_months"/>
<result property="loanStart" column="loan_start"/>
<result property="sortOrder" column="sort_order"/>
<result property="createdAt" column="created_at"/>
<result property="updatedAt" column="updated_at"/>
</resultMap>
<sql id="cols">id, member_id, type, name, issuer, account_number, card_type,
opening_balance, opening_date, current_value,
loan_amount, loan_rate, loan_method, loan_months, loan_start,
sort_order, created_at, updated_at</sql>
opening_balance, opening_date, current_value, sort_order, created_at, updated_at</sql>
<select id="findByMember" parameterType="long" resultMap="walletResultMap">
SELECT <include refid="cols"/> FROM wallet
@@ -44,14 +37,10 @@
<insert id="insert" parameterType="com.sb.web.account.domain.Wallet"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO wallet (member_id, type, name, issuer, account_number, card_type,
opening_balance, opening_date, current_value,
loan_amount, loan_rate, loan_method, loan_months, loan_start,
sort_order, created_at, updated_at)
opening_balance, opening_date, current_value, sort_order, created_at, updated_at)
VALUES (#{memberId}, #{type}, #{name}, #{issuer},
#{accountNumber, typeHandler=com.sb.web.common.crypto.EncryptedStringTypeHandler}, #{cardType},
#{openingBalance}, #{openingDate}, #{currentValue},
#{loanAmount}, #{loanRate}, #{loanMethod}, #{loanMonths}, #{loanStart},
#{sortOrder}, NOW(), NOW())
#{openingBalance}, #{openingDate}, #{currentValue}, #{sortOrder}, NOW(), NOW())
</insert>
<update id="update" parameterType="com.sb.web.account.domain.Wallet">
@@ -60,10 +49,7 @@
account_number = #{accountNumber, typeHandler=com.sb.web.common.crypto.EncryptedStringTypeHandler},
card_type = #{cardType},
opening_balance = #{openingBalance}, opening_date = #{openingDate},
current_value = #{currentValue},
loan_amount = #{loanAmount},
loan_rate = #{loanRate}, loan_method = #{loanMethod},
loan_months = #{loanMonths}, loan_start = #{loanStart}
current_value = #{currentValue}
WHERE id = #{id} AND member_id = #{memberId}
</update>
@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sb.web.auth.mapper.WithdrawMapper">
<!-- 내가 누른 표 -->
<delete id="deletePostVotesByMember">
DELETE FROM post_vote WHERE member_id = #{memberId}
</delete>
<delete id="deleteCommentVotesByMember">
DELETE FROM comment_vote WHERE member_id = #{memberId}
</delete>
<!-- 내 글에 달린 것들 -->
<delete id="deleteCommentVotesOnMyPosts">
DELETE cv FROM comment_vote cv
JOIN comment c ON c.id = cv.comment_id
JOIN post p ON p.id = c.post_id
WHERE p.author_id = #{memberId}
</delete>
<delete id="deletePostVotesOnMyPosts">
DELETE pv FROM post_vote pv
JOIN post p ON p.id = pv.post_id
WHERE p.author_id = #{memberId}
</delete>
<delete id="deletePostTagsOnMyPosts">
DELETE pt FROM post_tag pt
JOIN post p ON p.id = pt.post_id
WHERE p.author_id = #{memberId}
</delete>
<delete id="deleteCommentsOnMyPosts">
DELETE c FROM comment c
JOIN post p ON p.id = c.post_id
WHERE p.author_id = #{memberId}
</delete>
<!-- 내 댓글과 그 표 -->
<delete id="deleteCommentVotesOnMyComments">
DELETE cv FROM comment_vote cv
JOIN comment c ON c.id = cv.comment_id
WHERE c.author_id = #{memberId}
</delete>
<delete id="deleteCommentsByAuthor">
DELETE FROM comment WHERE author_id = #{memberId}
</delete>
<!-- 내 글 / 업로드 이미지 -->
<delete id="deletePostsByAuthor">
DELETE FROM post WHERE author_id = #{memberId}
</delete>
<delete id="deleteBoardImagesByMember">
DELETE FROM board_image WHERE member_id = #{memberId}
</delete>
<!-- 신고 / 포인트 / 결제 / 세션 -->
<delete id="deleteReportsByMember">
DELETE FROM report WHERE member_id = #{memberId}
</delete>
<delete id="deletePointHistory">
DELETE FROM point_history WHERE member_id = #{memberId}
</delete>
<delete id="deleteIapPurchases">
DELETE FROM iap_purchase WHERE member_id = #{memberId}
</delete>
<delete id="deleteAuthSessions">
DELETE FROM auth_session WHERE member_id = #{memberId}
</delete>
</mapper>
@@ -47,15 +47,12 @@ class AuthServiceTest {
@Mock ValueOperations<String, Object> valueOps;
@Mock AppSettingService appSettingService;
@Mock AuthSessionMapper authSessionMapper;
@Mock com.sb.web.auth.mapper.WithdrawMapper withdrawMapper;
@Mock com.sb.web.account.mapper.BackupMapper backupMapper;
AuthService service;
@BeforeEach
void setUp() {
service = new AuthService(memberMapper, passwordEncoder, redisTemplate, appSettingService, authSessionMapper,
withdrawMapper, backupMapper);
service = new AuthService(memberMapper, passwordEncoder, redisTemplate, appSettingService, authSessionMapper);
}
private Member localMember() {