Skip to content

Commit bacab50

Browse files
authored
[HOTFIX : fix currentUser ripple effect] - run live controller 핫픽스 (#80)
1 parent b7a25c8 commit bacab50

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/main/java/com/run_us/server/domains/running/live/controller/LiveRunningController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.run_us.server.domains.running.live.service.usecase.CreateLiveRunningUseCase;
55
import com.run_us.server.global.common.SuccessResponse;
66
import com.run_us.server.global.security.annotation.CurrentUser;
7-
import com.run_us.server.global.security.principal.UserPrincipal;
87
import lombok.RequiredArgsConstructor;
98
import org.springframework.http.ResponseEntity;
109
import org.springframework.stereotype.Controller;
@@ -22,9 +21,9 @@ public class LiveRunningController {
2221
@PostMapping()
2322
public ResponseEntity<SuccessResponse<LiveRunningCreateResponse>> createLiveRunning(
2423
@RequestParam("runPublicId") String runPublicId,
25-
@CurrentUser UserPrincipal userPrincipal) {
24+
@CurrentUser String currentUserPublicId) {
2625
SuccessResponse<LiveRunningCreateResponse> response =
27-
createLiveRunningUseCase.createLiveRunning(runPublicId, userPrincipal.getInternalId());
26+
createLiveRunningUseCase.createLiveRunning(runPublicId, currentUserPublicId);
2827
return ResponseEntity.ok(response);
2928
}
3029
}

src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
import com.run_us.server.global.common.SuccessResponse;
55

66
public interface CreateLiveRunningUseCase {
7-
SuccessResponse<LiveRunningCreateResponse> createLiveRunning(String runPublicId, Integer userId);
7+
SuccessResponse<LiveRunningCreateResponse> createLiveRunning(String runPublicId, String userPublicId);
88
}

src/main/java/com/run_us/server/domains/running/live/service/usecase/CreateLiveRunningUseCaseImpl.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.run_us.server.domains.running.run.service.RunQueryService;
99
import com.run_us.server.domains.running.run.service.RunValidator;
1010
import com.run_us.server.domains.running.run.service.model.ParticipantInfo;
11+
import com.run_us.server.domains.user.domain.UserPrincipal;
12+
import com.run_us.server.domains.user.service.resolver.UserIdResolver;
1113
import com.run_us.server.global.common.SuccessResponse;
1214
import lombok.RequiredArgsConstructor;
1315
import org.springframework.stereotype.Service;
@@ -23,15 +25,17 @@ public class CreateLiveRunningUseCaseImpl implements CreateLiveRunningUseCase {
2325
private final RunValidator runValidator;
2426
private final ParticipantService participantService;
2527
private final PassCodeRegistry passCodeRegistry;
28+
private final UserIdResolver userIdResolver;
2629

2730
@Override
2831
@Transactional
29-
public SuccessResponse<LiveRunningCreateResponse> createLiveRunning(String runPublicId, Integer userId) {
32+
public SuccessResponse<LiveRunningCreateResponse> createLiveRunning(String runPublicId, String userPublicId) {
33+
UserPrincipal UserPrincipal = userIdResolver.resolve(userPublicId);
3034
Run selectedRun = runQueryService.findByRunPublicId(runPublicId);
31-
runValidator.validateCurrentUserCanStartRun(userId, selectedRun);
32-
participantService.joinLiveRunning(userId, selectedRun);
35+
runValidator.validateCurrentUserCanStartRun(UserPrincipal.getInternalId(), selectedRun);
36+
participantService.joinLiveRunning(UserPrincipal.getInternalId(), selectedRun);
3337
String passcode = passCodeRegistry.generateAndGetPassCode(runPublicId);
34-
selectedRun.openLiveSession(userId);
38+
selectedRun.openLiveSession(UserPrincipal.getInternalId());
3539
List<ParticipantInfo> participantInfos = participantService.getParticipants(selectedRun);
3640
return SuccessResponse.of(RunningHttpResponseCode.LIVE_ROOM_CREATED, LiveRunningCreateResponse.from(selectedRun, passcode, participantInfos));
3741
}

src/main/java/com/run_us/server/global/config/CacheConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.run_us.server.global.common.cache.InMemoryCache;
66
import com.run_us.server.global.common.cache.SpringInMemoryCache;
77
import com.run_us.server.domains.user.domain.TokenStatus;
8-
import com.run_us.server.global.common.resolver.DomainPrincipal;
98
import org.springframework.beans.factory.annotation.Value;
109
import org.springframework.context.annotation.Bean;
1110
import org.springframework.context.annotation.Configuration;

0 commit comments

Comments
 (0)