Skip to content

Commit e195802

Browse files
authored
Merge branch 'main' into develop
2 parents 054b79b + c5de023 commit e195802

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/main/java/com/jangburich/domain/store/service/StoreService.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.jangburich.domain.store.service;
22

3+
import com.jangburich.domain.store.dto.StoreTeamResponse;
4+
import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
35
import java.time.LocalDate;
46
import java.time.LocalDateTime;
57
import java.util.ArrayList;
@@ -33,6 +35,8 @@
3335
import com.jangburich.domain.store.domain.StoreTeam;
3436
import com.jangburich.domain.store.domain.StoreUpdateRequestDTO;
3537
import com.jangburich.domain.store.dto.StoreTeamResponse;
38+
import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
39+
import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
3640
import com.jangburich.domain.store.dto.response.OrdersDetailResponse;
3741
import com.jangburich.domain.store.dto.response.OrdersGetResponse;
3842
import com.jangburich.domain.store.dto.response.OrdersTodayResponse;
@@ -209,15 +213,15 @@ public StoreGetResponseDTO getStoreInfo(String authentication) {
209213
return new StoreGetResponseDTO().of(store);
210214
}
211215

212-
public List<StoreTeamResponse> getPaymentGroup(String userId) {
216+
public List<com.jangburich.domain.store.dto.StoreTeamResponse> getPaymentGroup(String userId) {
213217
User user = userRepository.findByProviderId(userId)
214-
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
218+
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
215219

216220
Owner owner = ownerRepository.findByUser(user)
217-
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
221+
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
218222

219223
Store store = storeRepository.findByOwner(owner)
220-
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
224+
.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
221225

222226
return storeTeamRepository.findAllByStore(store)
223227
.stream()

0 commit comments

Comments
 (0)