Skip to content

[MERGE] Dev to Main#173

Merged
Iwantcod merged 9 commits into
mainfrom
dev
Mar 12, 2026
Merged

[MERGE] Dev to Main#173
Iwantcod merged 9 commits into
mainfrom
dev

Conversation

@Iwantcod
Copy link
Copy Markdown
Member

@Iwantcod Iwantcod commented Mar 12, 2026

개요

dev to main

관련 BackLog

Resolves: (Backlog Number, ...)

PR 유형

  • 새로운 기능 추가
  • 버그 수정
  • CSS 등 사용자 UI 디자인 변경
  • 코드에 영향을 주지 않는 변경사항(오타 수정, 탭 사이즈 변경, 변수명 변경)
  • 코드 리팩토링
  • 주석 추가 및 수정
  • 문서 수정
  • 테스트 추가, 테스트 리팩토링
  • 빌드 부분 혹은 패키지 매니저 수정
  • 파일 혹은 폴더명 수정
  • 파일 혹은 폴더 삭제

PR Checklist

  • 커밋 메시지 컨벤션에 맞게 작성했습니다.
  • 변경 사항에 대한 테스트를 했습니다.(버그 수정/기능에 대한 테스트).

Summary by CodeRabbit

Release Notes

  • New Features
    • Added endpoint to retrieve family's monthly shared pool usage with per-member breakdown.
    • Response data now includes user names in balance information and threshold configuration details (minimum and maximum data limit values).

@Iwantcod Iwantcod requested a review from Misu0616 March 12, 2026 00:11
@Iwantcod Iwantcod self-assigned this Mar 12, 2026
@Iwantcod Iwantcod added the documentation 문서 관련 작업 label Mar 12, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 12, 2026

Caution

Review failed

Pull request was closed or merged during review

📝 Walkthrough

Walkthrough

This PR introduces monthly shared pool usage tracking for families through new API endpoints and data structures, adds threshold configuration field exposure in API responses, extends mapper queries with complex aggregations, and enhances deployment validation scripts with dedicated health-check functions.

Changes

Cohort / File(s) Summary
Deployment Validation Enhancement
deploy/scripts/03_validate.sh
Adds three helper functions: log_common_diagnostics() for diagnostic output, check_release_health() for /actuator/health probing with status/body parsing, and check_traffic_container() for SPRING_PROFILES_ACTIVE validation. Refactors retry loops to use these functions.
Monthly Shared Pool Usage API
src/main/java/com/pooli/family/controller/FamilySharedPoolsController.java, src/main/java/com/pooli/family/service/FamilySharedPoolsService.java, src/main/java/com/pooli/family/domain/dto/response/SharedPoolMonthlyUsageResDto.java
Introduces new GET endpoint /api/shared-pools/usage/monthly-total with service layer support. Creates SharedPoolMonthlyUsageResDto with nested MemberUsageDto for per-member usage details. Service resolves family ID and fetches aggregated monthly usage data.
Shared Pool Persistence Layer
src/main/java/com/pooli/family/repository/FamilySharedPoolMapper.java, src/main/resources/mapper/family/FamilySharedPoolMapper.xml
Adds two mapper methods: selectFamilyPoolTotalData() and selectFamilyMonthlySharedUsageByLine(). XML queries include complex join and aggregation logic joining FAMILY, FAMILY_LINE, LINE, and USERS tables, filtering by family and current month.
Data Transfer Objects
src/main/java/com/pooli/data/domain/dto/response/DataBalancesResDto.java, src/main/java/com/pooli/line/domain/dto/response/IndividualThresholdResDto.java
Extends DataBalancesResDto with new userName field. Adds thresholdMinValue and thresholdMaxValue fields to IndividualThresholdResDto to expose threshold configuration bounds.
Threshold Query Enhancement
src/main/resources/mapper/line/LineMapper.xml
Updates selectIndividualThresholdByLineId to join LINE with PLAN table and compute thresholdMinValue and thresholdMaxValue based on plan basic_data_amount.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

  • PR #158: Modifies the same DataBalancesResDto class, potentially introducing conflicting changes to user identification fields
  • PR #142: Adds unauthenticated access to /actuator/** endpoints, which directly enables the deployment script's new health-check calls

Suggested labels

priority:high

Suggested reviewers

  • Misu0616
  • pjh813

Poem

🐰 Hoppy times, the pools they share,
Monthly tracking with great care,
Health checks leap through the air,
Thresholds dance beyond compare!

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 30.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Title check ❓ Inconclusive The PR title '[MERGE] Dev to Main' is generic and does not describe the actual changes in the pull request. The changeset includes multiple feature additions (shared pool APIs, DTO enhancements, deployment validation improvements), but the title only indicates a branch merge without conveying any meaningful information about the substantive changes. Replace the generic merge indicator with a specific summary of primary changes, such as 'Add shared pool monthly usage APIs and enhance validation checks' to clearly communicate the main contributions when scanning PR history.
✅ Passed checks (1 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
  • 📝 Generate docstrings (stacked PR)
  • 📝 Generate docstrings (commit on current branch)
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch dev

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Contributor

@Misu0616 Misu0616 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

리뷰 완!

@Iwantcod Iwantcod merged commit f00afb6 into main Mar 12, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation 문서 관련 작업

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants