Skip to content

[Release] 실시간 예상 급여 조회 기능 추가 #138

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
hyunzzii merged 1 commit into from
Jun 9, 2025
Merged

[Release] 실시간 예상 급여 조회 기능 추가 #138

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ public void deleteAccount(final Long storeId, final Long bossId) {

public List<PayrollWithStaffResponse> getPayrollsByMonth(final Long storeId, final Long bossId, final YearMonth yearMonth) {
storeService.isBossOfStore(storeId, bossId);
payrollSettingService.isTransferDateBefore(storeId, yearMonth);
payrollService.validateMonthIsBeforeCurrent(yearMonth);
// payrollSettingService.isTransferDateBefore(storeId, yearMonth);
// payrollService.validateMonthIsBeforeCurrent(yearMonth);

List<StaffEntity> staffs = staffService.getStaffsForStore(storeId);
List<PayrollEntity> payrolls = payrollService.getTransferredPayrollsByMonth(storeId, yearMonth);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class StaffPayrollFacade {

public PayrollResponse getPayrollDetail(final Long storeId, final Long userId, final YearMonth yearMonth) {
StaffEntity staff = staffService.getVerifiedStaff(userId, storeId);
payrollService.validateMonthIsBeforeCurrent(yearMonth);
// payrollService.validateMonthIsBeforeCurrent(yearMonth);
PayrollEntity payroll = payrollService.getPayrollForStaffAndMonth(staff.getId(), yearMonth);
if (payroll != null) {
return PayrollResponse.ofForPayroll(payroll, payslipService.getPayslipByPayrollId(payroll.getId()));
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/resources/data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VALUES (1, '[email protected]', '망고보스', null, '010-1234-5678', '11111111'
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
'BOSS', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(2, '[email protected]', '망알바', null, '010-2312-1111', '22222222', '2006-05-11',
'http://k.kakaocdn.net/dn/KNfQc/btsNkI4rZDT/FqS6EhArmExoRcVX9bane1/img_110x110.jpg',
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(3, '[email protected]', '고알바', null, '010-4972-4844', '33333333', '2004-07-22',
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
Expand All @@ -16,7 +16,7 @@ VALUES (1, '[email protected]', '망고보스', null, '010-1234-5678', '11111111'
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(6, '[email protected]', '정알바', null, '010-7712-2367', '66666666', '1997-09-01',
'http://k.kakaocdn.net/dn/bD4Rih/btsNXAxY4w1/XuxLt8jAsnIA5ZaHVjkE0k/img_110x110.jpg',
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

INSERT INTO store (store_id, boss_id, name, address, business_number, store_type, invite_code,
Expand Down