[Chore]: main -> dev 동기화

.gitignore

@@ -46,3 +46,4 @@ out/
 
 ### Setting ###
 .env
+/secrets

build.gradle

@@ -54,6 +54,7 @@ dependencies {
 
     implementation 'org.springframework.ai:spring-ai-starter-model-openai'
     implementation 'org.springframework.ai:spring-ai-starter-vector-store-pgvector'
+    implementation 'com.google.auth:google-auth-library-oauth2-http:1.23.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-data-redis'
@@ -68,6 +69,10 @@ tasks.named('test') {
     useJUnitPlatform()
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
+
 tasks.named('asciidoctor') {
     inputs.dir snippetsDir
     dependsOn test

src/main/java/com/jjikmeok/app/AppApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @EnableJpaAuditing
+@EnableScheduling
 @SpringBootApplication
 @ConfigurationPropertiesScan
 public class AppApplication {

src/main/java/com/jjikmeok/app/domain/activity/controller/ActivityController.java

@@ -130,7 +130,7 @@ public ApiResponse<ActivityDetailResponse> getActivity(
     @PreAuthorize("hasRole('ADMIN')")
     public ApiResponse<ActivityDetailResponse> createActivity(
             @RequestBody @Valid ActivityRequest request) {
-        return ApiResponse.success("활동 생성 성공", activityService.createActivity(request));
+        return ApiResponse.created("활동 생성 성공", activityService.createActivity(request));
     }
 
     @Operation(summary = "활동 수정 (관리자)", description = "특정 활동 정보를 수정합니다.")

src/main/java/com/jjikmeok/app/domain/activity/controller/AdminActivityIngestionController.java

@@ -0,0 +1,68 @@
+package com.jjikmeok.app.domain.activity.controller;
+
+import com.jjikmeok.app.domain.activity.enums.SourceType;
+import com.jjikmeok.app.domain.activity.service.AdminActivityIngestionService;
+import com.jjikmeok.app.domain.activity.privateactivity.dto.response.DiscoverySheetRowDto;
+import com.jjikmeok.app.domain.activity.publicactivity.dto.ActivitySyncResponse;
+import com.jjikmeok.app.global.common.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Tag(name = "활동 수집 관리자 API", description = "공공/민간/디스커버리 활동 수집 관리자 API")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/admin/activities/sources")
+@PreAuthorize("hasRole('ADMIN')")
+public class AdminActivityIngestionController {
+
+    private final AdminActivityIngestionService adminActivityIngestionService;
+
+    @Operation(summary = "공공 활동 소스 전체 동기화")
+    @PostMapping("/public/sync")
+    public ApiResponse<String> syncAllPublicSources() {
+        adminActivityIngestionService.syncAllPublicSources();
+        return ApiResponse.success("공공 활동 동기화를 시작했습니다.", "상세 내용은 서버 로그를 확인하세요.");
+    }
+
+    @Operation(summary = "공공 활동 소스 개별 동기화")
+    @PostMapping("/public/{sourceType}/sync")
+    public ApiResponse<ActivitySyncResponse> syncPublicSource(
+            @PathVariable("sourceType") SourceType sourceType,
+            @RequestParam(required = false) Integer maxPages
+    ) {
+        return ApiResponse.success(
+                "공공 활동 소스 동기화를 완료했습니다.",
+                adminActivityIngestionService.syncPublicSource(sourceType, maxPages)
+        );
+    }
+
+    @Operation(summary = "디스커버리 활동 후보 수집")
+    @PostMapping("/discovery/collect")
+    public ApiResponse<List<DiscoverySheetRowDto>> collectDiscoveryActivities(
+            @RequestParam(required = false) Integer keywordLimit,
+            @RequestParam(required = false) Integer resultLimit
+    ) {
+        return ApiResponse.success(
+                "디스커버리 활동 후보 수집을 완료했습니다.",
+                adminActivityIngestionService.collectDiscoveryActivities(keywordLimit, resultLimit)
+        );
+    }
+
+    @Operation(summary = "발행 대기 디스커버리 활동 발행")
+    @PostMapping("/discovery/publish")
+    public ApiResponse<Integer> publishDiscoveryActivities() {
+        return ApiResponse.success(
+                "디스커버리 활동 발행을 완료했습니다.",
+                adminActivityIngestionService.publishDiscoveryActivities()
+        );
+    }
+}

src/main/java/com/jjikmeok/app/domain/activity/converter/ActivityConverter.java

@@ -19,6 +19,9 @@ public static Activity toEntity(ActivityRequest request, Region region) {
                 .thumbnailUrl(request.thumbnailUrl())
                 .sourceUrl(request.sourceUrl())
                 .address(request.address())
+                .organizer(request.organizer())
+                .contactInfo(request.contactInfo())
+                .target(request.target())
                 .startAt(request.startAt())
                 .endAt(request.endAt())
                 .recruitStartAt(request.recruitStartAt())

src/main/java/com/jjikmeok/app/domain/activity/dto/request/ActivityRequest.java

@@ -17,6 +17,9 @@ public record ActivityRequest(
         String thumbnailUrl,
         @NotBlank(message = "sourceUrl은 필수입니다.") String sourceUrl,
         String address,
+        String organizer,
+        String contactInfo,
+        String target,
         LocalDateTime startAt,
         LocalDateTime endAt,
         LocalDateTime recruitStartAt,
@@ -28,4 +31,47 @@ public record ActivityRequest(
         String externalId,
         ApprovalStatus approvalStatus,
         Boolean isActive
-) {}
+) {
+    public ActivityRequest(
+            Long regionId,
+            String title,
+            String description,
+            String thumbnailUrl,
+            String sourceUrl,
+            String address,
+            LocalDateTime startAt,
+            LocalDateTime endAt,
+            LocalDateTime recruitStartAt,
+            LocalDateTime recruitEndAt,
+            Integer price,
+            ActivityType activityType,
+            ActivityCategory category,
+            SourceType sourceType,
+            String externalId,
+            ApprovalStatus approvalStatus,
+            Boolean isActive
+    ) {
+        this(
+                regionId,
+                title,
+                description,
+                thumbnailUrl,
+                sourceUrl,
+                address,
+                null,
+                null,
+                null,
+                startAt,
+                endAt,
+                recruitStartAt,
+                recruitEndAt,
+                price,
+                activityType,
+                category,
+                sourceType,
+                externalId,
+                approvalStatus,
+                isActive
+        );
+    }
+}