diff --git a/src/main/java/com/run_us/server/domains/running/live/controller/LiveRunningController.java b/src/main/java/com/run_us/server/domains/running/live/controller/LiveRunningController.java index b2443d3..51cce54 100644 --- a/src/main/java/com/run_us/server/domains/running/live/controller/LiveRunningController.java +++ b/src/main/java/com/run_us/server/domains/running/live/controller/LiveRunningController.java @@ -4,7 +4,6 @@ import com.run_us.server.domains.running.live.service.usecase.CreateLiveRunningUseCase; import com.run_us.server.global.common.SuccessResponse; import com.run_us.server.global.security.annotation.CurrentUser; -import com.run_us.server.global.security.principal.UserPrincipal; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -22,9 +21,9 @@ public class LiveRunningController { @PostMapping() public ResponseEntity> createLiveRunning( @RequestParam("runPublicId") String runPublicId, - @CurrentUser UserPrincipal userPrincipal) { + @CurrentUser String currentUserPublicId) { SuccessResponse response = - createLiveRunningUseCase.createLiveRunning(runPublicId, userPrincipal.getInternalId()); + createLiveRunningUseCase.createLiveRunning(runPublicId, currentUserPublicId); return ResponseEntity.ok(response); } } diff --git a/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCase.java b/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCase.java index ecc9066..4038e1a 100644 --- a/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCase.java +++ b/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCase.java @@ -4,5 +4,5 @@ import com.run_us.server.global.common.SuccessResponse; public interface CreateLiveRunningUseCase { - SuccessResponse createLiveRunning(String runPublicId, Integer userId); + SuccessResponse createLiveRunning(String runPublicId, String userPublicId); } diff --git a/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCaseImpl.java b/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCaseImpl.java index aee5dab..49939de 100644 --- a/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCaseImpl.java +++ b/src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCaseImpl.java @@ -8,6 +8,8 @@ import com.run_us.server.domains.running.run.service.RunQueryService; import com.run_us.server.domains.running.run.service.RunValidator; import com.run_us.server.domains.running.run.service.model.ParticipantInfo; +import com.run_us.server.domains.user.domain.UserPrincipal; +import com.run_us.server.domains.user.service.resolver.UserIdResolver; import com.run_us.server.global.common.SuccessResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,15 +25,17 @@ public class CreateLiveRunningUseCaseImpl implements CreateLiveRunningUseCase { private final RunValidator runValidator; private final ParticipantService participantService; private final PassCodeRegistry passCodeRegistry; + private final UserIdResolver userIdResolver; @Override @Transactional - public SuccessResponse createLiveRunning(String runPublicId, Integer userId) { + public SuccessResponse createLiveRunning(String runPublicId, String userPublicId) { + UserPrincipal UserPrincipal = userIdResolver.resolve(userPublicId); Run selectedRun = runQueryService.findByRunPublicId(runPublicId); - runValidator.validateCurrentUserCanStartRun(userId, selectedRun); - participantService.joinLiveRunning(userId, selectedRun); + runValidator.validateCurrentUserCanStartRun(UserPrincipal.getInternalId(), selectedRun); + participantService.joinLiveRunning(UserPrincipal.getInternalId(), selectedRun); String passcode = passCodeRegistry.generateAndGetPassCode(runPublicId); - selectedRun.openLiveSession(userId); + selectedRun.openLiveSession(UserPrincipal.getInternalId()); List participantInfos = participantService.getParticipants(selectedRun); return SuccessResponse.of(RunningHttpResponseCode.LIVE_ROOM_CREATED, LiveRunningCreateResponse.from(selectedRun, passcode, participantInfos)); } diff --git a/src/main/java/com/run_us/server/global/config/CacheConfig.java b/src/main/java/com/run_us/server/global/config/CacheConfig.java index ee3d9b1..0bece3d 100644 --- a/src/main/java/com/run_us/server/global/config/CacheConfig.java +++ b/src/main/java/com/run_us/server/global/config/CacheConfig.java @@ -5,7 +5,6 @@ import com.run_us.server.global.common.cache.InMemoryCache; import com.run_us.server.global.common.cache.SpringInMemoryCache; import com.run_us.server.domains.user.domain.TokenStatus; -import com.run_us.server.global.common.resolver.DomainPrincipal; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;