Skip to content

Commit b194758

Browse files
committed
refactor: 실시간 예상 급여 조회 가능하게 수정
1 parent 42834cf commit b194758

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public void deleteAccount(final Long storeId, final Long bossId) {
110110

111111
public List<PayrollWithStaffResponse> getPayrollsByMonth(final Long storeId, final Long bossId, final YearMonth yearMonth) {
112112
storeService.isBossOfStore(storeId, bossId);
113-
payrollSettingService.isTransferDateBefore(storeId, yearMonth);
114-
payrollService.validateMonthIsBeforeCurrent(yearMonth);
113+
// payrollSettingService.isTransferDateBefore(storeId, yearMonth);
114+
// payrollService.validateMonthIsBeforeCurrent(yearMonth);
115115

116116
List<StaffEntity> staffs = staffService.getStaffsForStore(storeId);
117117
List<PayrollEntity> payrolls = payrollService.getTransferredPayrollsByMonth(storeId, yearMonth);

app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class StaffPayrollFacade {
2727

2828
public PayrollResponse getPayrollDetail(final Long storeId, final Long userId, final YearMonth yearMonth) {
2929
StaffEntity staff = staffService.getVerifiedStaff(userId, storeId);
30-
payrollService.validateMonthIsBeforeCurrent(yearMonth);
30+
// payrollService.validateMonthIsBeforeCurrent(yearMonth);
3131
PayrollEntity payroll = payrollService.getPayrollForStaffAndMonth(staff.getId(), yearMonth);
3232
if (payroll != null) {
3333
return PayrollResponse.ofForPayroll(payroll, payslipService.getPayslipByPayrollId(payroll.getId()));

app/src/main/resources/data.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VALUES (1, 'test1@ajou.ac.kr', '망고보스', null, '010-1234-5678', '11111111'
44
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
55
'BOSS', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
66
(2, 'test2@ajou.ac.kr', '망알바', null, '010-2312-1111', '22222222', '2006-05-11',
7-
'http://k.kakaocdn.net/dn/KNfQc/btsNkI4rZDT/FqS6EhArmExoRcVX9bane1/img_110x110.jpg',
7+
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
88
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
99
(3, 'test3@ajou.ac.kr', '고알바', null, '010-4972-4844', '33333333', '2004-07-22',
1010
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
@@ -16,7 +16,7 @@ VALUES (1, 'test1@ajou.ac.kr', '망고보스', null, '010-1234-5678', '11111111'
1616
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
1717
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
1818
(6, 'test6@ajou.ac.kr', '정알바', null, '010-7712-2367', '66666666', '1997-09-01',
19-
'http://k.kakaocdn.net/dn/bD4Rih/btsNXAxY4w1/XuxLt8jAsnIA5ZaHVjkE0k/img_110x110.jpg',
19+
'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800',
2020
'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
2121

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

0 commit comments

Comments
 (0)