Merge branch 'develop' into URECA-60/Fix/fixsummary

Author: Zoo2-bi

.gitignore

@@ -47,6 +47,10 @@ src/main/resources/gcp/
 # GCP
 gcp/*.json
 src/main/resources/gcp/*.json
+!**/src/main/resources/gcp/unity-stt.json
+src/main/resources/gcp/
+!**/src/main/resources/gcp/unity-stt.sample.json
+!**/src/main/resources/gcp/.gitkeep
 
 # Spring secrets
 application-local.yml

build.gradle

@@ -44,6 +44,8 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
 
     implementation 'ws.schild:jave-all-deps:3.3.1'
+    implementation 'commons-codec:commons-codec:1.15'  // Base64 클래스 포함
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
 }
 
 tasks.named('test') {

src/main/java/com/ureca/unity/domain/auth/dto/MeResponse.java

@@ -3,6 +3,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.time.Instant;
+
 @Getter
 @AllArgsConstructor
 public class MeResponse {
@@ -11,4 +13,7 @@ public class MeResponse {
     private final String name;
     private final String role;
     private final String provider;
+
+    private final boolean termsAgreed;
+    private final Instant termsAgreedAt;
 }

src/main/java/com/ureca/unity/domain/auth/dto/OAuthLoginResponse.java

@@ -11,4 +11,5 @@ public class OAuthLoginResponse {
 
     private final TokenResponse token;
     private final boolean requiresOnboarding;
+    private final boolean termsAgreed;
 }

src/main/java/com/ureca/unity/domain/auth/dto/TokenResponse.java

@@ -9,5 +9,6 @@
 @AllArgsConstructor
 public class TokenResponse {
     private final String accessToken;
+    private final long userId;
     private final long accessTokenExpiresIn;
 }

src/main/java/com/ureca/unity/domain/auth/service/AuthSessionServiceImpl.java

@@ -61,7 +61,9 @@ public MeResponse getMe(HttpServletRequest request) {
                 user.getEmail(),
                 user.getName(),
                 user.getRole(),
-                user.getProvider()
+                user.getProvider(),
+                user.getTermsAgreedAt() != null,
+                user.getTermsAgreedAt()
         );
     }
 

src/main/java/com/ureca/unity/domain/auth/service/OAuthServiceImpl.java

@@ -80,6 +80,11 @@ private OAuthLoginResult createLoginResult(
             OAuthTokenInfo tokenInfo
     ) {
         try {
+            User user = userMapper.findById(userId)
+                    .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+            boolean termsAgreed = user.getTermsAgreedAt() != null;
+
             oAuthTokenService.upsert(
                     OAuthToken.builder()
                             .userId(userId)
@@ -106,6 +111,7 @@ private OAuthLoginResult createLoginResult(
                     OAuthLoginResponse.builder()
                             .token(accessToken)
                             .requiresOnboarding(requiresOnboarding)
+                            .termsAgreed(termsAgreed)
                             .build(),
                     refreshToken
             );

src/main/java/com/ureca/unity/domain/call/controller/CallController.java

@@ -0,0 +1,31 @@
+package com.ureca.unity.domain.call.controller;
+
+import com.ureca.unity.domain.call.dto.response.AgoraTokenResponse;
+import com.ureca.unity.domain.call.service.CallService;
+import com.ureca.unity.global.exception.CustomException;
+import com.ureca.unity.global.exception.ErrorCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/agora")
+@RequiredArgsConstructor
+@Slf4j
+public class CallController {
+
+    private final CallService callService;
+
+    @GetMapping("/token")
+    public ResponseEntity<AgoraTokenResponse> getRtcToken(
+            @RequestParam String channel,
+            @RequestParam(defaultValue = "0") int uid) {
+        log.debug("토큰 요청: {}, 채널: {}",uid,channel);
+        AgoraTokenResponse value=callService.makeToken(channel,uid);
+        return ResponseEntity.ok(value);
+    }
+}

src/main/java/com/ureca/unity/domain/call/controller/RecordingController.java

@@ -0,0 +1,39 @@
+package com.ureca.unity.domain.call.controller;
+
+import com.ureca.unity.domain.call.dto.request.RecordingRequest;
+import com.ureca.unity.domain.call.dto.request.RecordingStopRequest;
+import com.ureca.unity.domain.call.dto.response.RecordingResponse;
+import com.ureca.unity.domain.call.service.RecordingServiceImpl;
+import com.ureca.unity.global.exception.CustomException;
+import com.ureca.unity.global.exception.ErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.ErrorResponse;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/recording")
+@RequiredArgsConstructor
+public class RecordingController {
+
+    private final RecordingServiceImpl recordingService;
+
+    @PostMapping("/start")
+    public ResponseEntity<RecordingResponse> startRecording(@RequestBody RecordingRequest request) {
+        String resourceId = recordingService.acquire(request.channelName(), request.uid());
+        String sid = recordingService.start(resourceId, request.channelName(), request.uid(), request.token());
+        return ResponseEntity.ok(new RecordingResponse(resourceId, sid));
+    }
+
+    @PostMapping("/stop")
+    public ResponseEntity<String> stopRecording(@RequestBody RecordingStopRequest request) {
+        recordingService.stop(
+                request.resourceId(),
+                request.sid(),
+                request.channelName(),
+                request.uid(),
+                request.userId()
+        );
+        return ResponseEntity.ok("Recording stopped successfully");
+    }
+}

src/main/java/com/ureca/unity/domain/call/dto/request/RecordingRequest.java

@@ -0,0 +1,3 @@
+package com.ureca.unity.domain.call.dto.request;
+
+public record RecordingRequest(String channelName, String uid, String token){}