Skip to content

Dev#158

Merged
ms-0o0 merged 15 commits into
mainfrom
dev
Mar 11, 2026
Merged

Dev#158
ms-0o0 merged 15 commits into
mainfrom
dev

Conversation

@ms-0o0
Copy link
Copy Markdown
Contributor

@ms-0o0 ms-0o0 commented Mar 11, 2026

개요

관련 BackLog

Resolves: 432

PR 유형

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

PR Checklist

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

Summary by CodeRabbit

  • New Features

    • Added block status endpoint to check current block status and end time
    • Enhanced family member identification with indicator for current user
    • Expanded policy information with shared and daily data limits
  • Bug Fixes

    • Fixed notification type handling to preserve existing types instead of overwriting
  • Refactor

    • Updated data summary retrieval to use authenticated user context

@ms-0o0 ms-0o0 requested a review from hyeonRS March 11, 2026 05:47
@ms-0o0 ms-0o0 self-assigned this Mar 11, 2026
@ms-0o0 ms-0o0 added the bug 버그 관련 label Mar 11, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 11, 2026

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 0f207692-a255-4886-bd00-69f32dc3f8cd

📥 Commits

Reviewing files that changed from the base of the PR and between 590c88c and bcad22c.

📒 Files selected for processing (23)
  • src/main/java/com/pooli/common/filter/LoggingFilter.java
  • src/main/java/com/pooli/data/controller/DataController.java
  • src/main/java/com/pooli/data/domain/dto/response/DataBalancesResDto.java
  • src/main/java/com/pooli/family/domain/dto/response/FamilyMembersResDto.java
  • src/main/java/com/pooli/family/mapper/FamilyMapper.java
  • src/main/java/com/pooli/family/service/impl/FamilyServiceImpl.java
  • src/main/java/com/pooli/notification/service/AlarmHistoryServiceImpl.java
  • src/main/java/com/pooli/policy/controller/UserPolicyController.java
  • src/main/java/com/pooli/policy/domain/dto/response/BlockStatusResDto.java
  • src/main/java/com/pooli/policy/domain/dto/response/LimitPolicyResDto.java
  • src/main/java/com/pooli/policy/mapper/BlockStatusMapper.java
  • src/main/java/com/pooli/policy/mapper/LineLimitMapper.java
  • src/main/java/com/pooli/policy/service/AdminPolicyServiceImpl.java
  • src/main/java/com/pooli/policy/service/UserPolicyService.java
  • src/main/java/com/pooli/policy/service/UserPolicyServiceImpl.java
  • src/main/resources/application-local.yml
  • src/main/resources/mapper/data/DataMapper.xml
  • src/main/resources/mapper/family/FamilyMapper.xml
  • src/main/resources/mapper/notification/AlarmSettingMapper.xml
  • src/main/resources/mapper/policy/BlockStatusMapper.xml
  • src/main/resources/mapper/policy/LineLimitMapper.xml
  • src/test/java/com/pooli/data/service/impl/DataServiceImplTest.java
  • src/test/java/com/pooli/family/service/impl/FamilyServiceImplTest.java

📝 Walkthrough

Walkthrough

This PR introduces block status management features, refactors authentication patterns, and extends multiple DTOs with new fields. Changes include: a new block status API endpoint with database queries for immediate and repeat block detection, authentication-based lineId retrieval in existing endpoints, additions of lineId and isMe fields to response DTOs, mapper signature updates to pass lineId context, conditional notification type handling, and extended policy limit fields. A MongoDB URI environment variable typo is also corrected.

Changes

Cohort / File(s) Summary
Logging & Filter Infrastructure
src/main/java/com/pooli/common/filter/LoggingFilter.java
Introduces ContentCachingRequestWrapper at filter start with early /actuator URI check for delegation bypass, consolidating wrapper creation and reusing single instance while maintaining latency logging.
Data Access & DTO Updates
src/main/java/com/pooli/data/controller/DataController.java, src/main/java/com/pooli/data/domain/dto/response/DataBalancesResDto.java, src/main/resources/mapper/data/DataMapper.xml
Updates getDataSummary endpoint to accept AuthUserDetails principal instead of explicit lineId parameter; replaces userName field with lineId in DataBalancesResDto; updates SQL mapping to include lineId in result set.
Family Member Management
src/main/java/com/pooli/family/domain/dto/response/FamilyMembersResDto.java, src/main/java/com/pooli/family/mapper/FamilyMapper.java, src/main/java/com/pooli/family/service/impl/FamilyServiceImpl.java, src/main/resources/mapper/family/FamilyMapper.xml, src/test/java/com/pooli/family/service/impl/FamilyServiceImplTest.java
Adds isMe boolean field to FamilyMemberDto; updates selectFamilyMembers mapper signature to accept lineId parameter; adds selectPoolBaseDataByLineId mapper method; updates service to pass principal.getLineId() to mapper; adjusts test construction and mocking.
Block Status Management
src/main/java/com/pooli/policy/controller/UserPolicyController.java, src/main/java/com/pooli/policy/domain/dto/response/BlockStatusResDto.java, src/main/java/com/pooli/policy/mapper/BlockStatusMapper.java, src/main/resources/mapper/policy/BlockStatusMapper.xml, src/main/java/com/pooli/policy/service/UserPolicyService.java, src/main/java/com/pooli/policy/service/UserPolicyServiceImpl.java
Introduces new getBlockStatus API endpoint with comprehensive block status checking; adds BlockStatusResDto DTO with isBlocked and blockEndsAt fields; implements BlockStatusMapper querying immediate and repeat blocks; extends UserPolicyServiceImpl with block status computation logic including overnight time handling, duplication conflict checks, and alarm emission refactoring.
Policy Limits Enhancement
src/main/java/com/pooli/policy/domain/dto/response/LimitPolicyResDto.java, src/main/java/com/pooli/policy/mapper/LineLimitMapper.java, src/main/resources/mapper/policy/LineLimitMapper.xml
Adds maxSharedData and maxDailyData fields to LimitPolicyResDto; introduces selectPlanDataLimitByLineId mapper method with SQL query to retrieve plan data limit by lineId.
Policy Administration
src/main/java/com/pooli/policy/service/AdminPolicyServiceImpl.java
Renames sendOwnerNotification to sendPolicyNotification accepting targetType parameter; updates call site to pass NotificationTargetType.OWNER.
Notifications
src/main/java/com/pooli/notification/service/AlarmHistoryServiceImpl.java, src/main/resources/mapper/notification/AlarmSettingMapper.xml
Makes notification type field conditional: preserves existing "type" value if present, otherwise defaults to "NOTIFICATION"; normalizes ALARM_SETTING table name casing in insert and update statements.
Configuration & Tests
src/main/resources/application-local.yml, src/test/java/com/pooli/data/service/impl/DataServiceImplTest.java
Corrects MongoDB URI environment variable from L0CAL_MONGO_URI to LOCAL_MONGO_URI; updates DataServiceImplTest to populate lineId instead of userName in expected DTO.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

Suggested labels

feature

Suggested reviewers

  • hyeonRS
  • hyuuuun

Poem

🐰 New block status queries hop through time,
With lineId threads and isMe flags so fine,
Authentication now holds the key,
While repeat blocks dance through family—
A rabbit's work is never quite done! 🐇✨

✨ 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.

@ms-0o0 ms-0o0 merged commit 366d5a5 into main Mar 11, 2026
2 of 3 checks passed
This was referenced Mar 13, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug 버그 관련

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants