Skip to content
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

빌드오류해결 #72

Merged
merged 1 commit into from
Dec 21, 2023
Merged

빌드오류해결 #72

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
10 changes: 4 additions & 6 deletions src/main/java/com/catcher/core/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.catcher.core.dto.user.UserCreateRequest;
import com.catcher.core.dto.user.UserInfoResponse;
import com.catcher.core.dto.user.UserLoginRequest;
import com.catcher.resource.request.PromotionRequest;
import com.catcher.infrastructure.external.service.S3UploadService;
import com.catcher.resource.request.PromotionRequest;
import com.catcher.resource.request.UserInfoEditRequest;
import com.catcher.resource.response.UserDetailsResponse;
import com.catcher.security.CatcherUser;
Expand All @@ -28,16 +28,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.time.ZonedDateTime;
import java.util.Optional;

import static com.catcher.common.BaseResponseStatus.*;
import static com.catcher.core.domain.entity.BaseTimeEntity.zoneId;
import static com.catcher.core.domain.entity.enums.UserProvider.CATCHER;
import static com.catcher.core.domain.entity.enums.UserRole.USER;
import static com.catcher.resource.request.PromotionRequest.*;
import static com.catcher.resource.request.PromotionRequest.PromotionType;
import static com.catcher.utils.JwtUtils.REFRESH_TOKEN_EXPIRATION_MILLIS;
import static com.catcher.utils.KeyGenerator.AuthType.*;
import static com.catcher.utils.KeyGenerator.AuthType.REFRESH_TOKEN;

@RequiredArgsConstructor
@Transactional(readOnly = true)
Expand Down Expand Up @@ -174,7 +172,7 @@ private User createUser(UserCreateRequest userCreateRequest) {
.nickname(userCreateRequest.getNickname())
.userProvider(CATCHER)
.userRole(USER)
.phoneAuthentication(ZonedDateTime.now(zoneId))
.phoneAuthentication(userCreateRequest.getMarketingTerm())
.userAgeTerm(userCreateRequest.getAgeTerm())
.userServiceTerm(userCreateRequest.getServiceTerm())
.userPrivacyTerm(userCreateRequest.getPrivacyTerm())
dev-khg marked this conversation as resolved.
Show resolved Hide resolved
Expand Down