✨ [Feature] 모니터링스레드 - 42api event받아오기 / 기간지난 이벤트 deactivate / slack봇 알람 기능 구현 #1152

.github/workflows/checkstyle-validation.yml

@@ -1,8 +1,10 @@
 name: 👮Checkstyle validation
 
 on:
+  push:
+    branches: [ 1151-feature-42api-모니터링스레드에작업 ]
   pull_request:
-    branches: [ main, dev , recruit-dev]
+    branches: [ main, dev , recruit-dev ]
 
 jobs:
   checkstyle:

.github/workflows/http-client.env.json

@@ -0,0 +1,5 @@
+{
+  "dev": {
+    "name": "value"
+  }
+}

.github/workflows/test-code-validation.yml

@@ -1,8 +1,10 @@
 name: 💻 Test code validation
 
 on:
+  push:
+    branches: [ 1151-feature-42api-모니터링스레드에작업 ]
   pull_request:
-    branches: [main, dev]
+    branches: [ main, dev ]
 
 jobs:
   test:

.github/workflows/test-deploy.yml

@@ -9,14 +9,9 @@ name: test-deploy
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev, recruit_recruit-dev, 1151-feature-42api-모니터링스레드에작업 ]
   workflow_dispatch:
 
-env:
-  DOCKER_USER: ${{ secrets.DOCKER_USER }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  IMAGE_NAME: wken5577/test-migrate-server
-
 permissions:
   contents: read
 
@@ -41,52 +36,8 @@ jobs:
           echo "${{ secrets.MIGRATE_APPLICATION_YML }}" | base64 -d > application.yml
         shell: bash
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ env.DOCKER_USER }}
-          password: ${{ env.DOCKER_PASSWORD }}
-
       - name: Test with Gradle
         run: ./gradlew clean test
 
       - name: Build with Gradle
         run: ./gradlew clean build -x test
-
-      - name: build new docker image as latest tag
-        run: |
-          docker build -t ${{ env.IMAGE_NAME }}:latest .
-          docker push ${{ env.IMAGE_NAME }}:latest
-
-      - name: Create the configuration file
-        run: |
-          cat << EOF > config.json
-          {
-          "AutoScalingGroupName": "gg-dev",
-          "DesiredConfiguration": {
-           "LaunchTemplate": {
-             "LaunchTemplateId": "${{ secrets.DEV_LAUNCH_TEMPLATE_ID }}",
-             "Version": "\$Latest"
-           }
-          },
-          "Preferences": {
-           "MinHealthyPercentage": 100,
-           "MaxHealthyPercentage": 110,
-           "InstanceWarmup": 300,
-           "ScaleInProtectedInstances": "Ignore",
-           "StandbyInstances": "Ignore"
-          }
-          }
-          EOF
-          cat config.json
-
-      - name: Configure AWS CLI
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_TEST_MIGRATE_SECURITY_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_TEST_MIGRATE_SECURITY_SECRET_KEY }}
-          aws-region: ap-northeast-2
-
-      - name: Trigger Instance Refresh
-        run: |
-          aws autoscaling start-instance-refresh --cli-input-json file://config.json

build.gradle

@@ -8,6 +8,11 @@ plugins {
     id 'checkstyle'
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
 editorconfig {
     excludes = ['build']
 }

gg-admin-repo/src/test/java/gg/admin/repo/TestSpringBootApplication.java

@@ -3,6 +3,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication(scanBasePackages = {"gg.recruit.api", "gg.utils", "gg.data", "gg.repo",
-	"gg.admin.repo", "gg.auth", "gg.pingpong.api"})
+	"gg.admin.repo", "gg.auth", "gg.pingpong.api", "gg.calendar.api"})
 public class TestSpringBootApplication {
 }

gg-auth/src/main/java/gg/auth/FortyTwoAuthUtil.java

@@ -23,17 +23,21 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import gg.auth.config.ScheduleConfig;
 import gg.utils.exception.ErrorCode;
 import gg.utils.exception.custom.NotExistException;
 import gg.utils.exception.user.TokenNotValidException;
 import gg.utils.external.ApiUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class FortyTwoAuthUtil {
 	private final ApiUtil apiUtil;
 	private final OAuth2AuthorizedClientService authorizedClientService;
+	private final ScheduleConfig scheduleConfig;
 
 	public String getAccessToken() {
 		Authentication authentication = getAuthenticationFromContext();
@@ -62,6 +66,32 @@
 		return newClient.getAccessToken().getTokenValue();
 	}
 
+	/* 42event client credential token */
+	public String getClientCredentialToken() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+		params.add("grant_type", "client_credentials");
+		params.add("client_id", scheduleConfig.getClientId());
+		params.add("client_secret", scheduleConfig.getClientSecret());
+
+		try {
+			Map<String, Object> response = apiUtil.apiCall(
+				scheduleConfig.getTokenUri(),
+				Map.class,
+				headers,
+				params,
+				HttpMethod.POST
+			);
+			log.info("Raw Api Response : {}", response);
+			// System.out.println("Response : " + response);
+			return (String)response.get("access_token");
+		} catch (Exception e) {
+			throw new TokenNotValidException();
+		}
+	}
+
 	private Authentication getAuthenticationFromContext() {
 		SecurityContext context = SecurityContextHolder.getContext();
 		return context.getAuthentication();

gg-auth/src/main/java/gg/auth/config/ScheduleConfig.java

@@ -0,0 +1,17 @@
+package gg.auth.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import lombok.Getter;
+
+@Configuration
+@Getter
+public class ScheduleConfig {
+	@Value("${spring.security.oauth2.client.registration.42.client-id}")
+	private String clientId;
+	@Value("${spring.security.oauth2.client.registration.42.client-secret}")
+	private String clientSecret;
+	@Value("${spring.security.oauth2.client.provider.42.token-uri}")
+	private String tokenUri;
+}

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/publicschedule/controller/PublicScheduleAdminController.java

@@ -61,6 +61,5 @@ public ResponseEntity<Void> publicScheduleDelete(@PathVariable Long id) {
 	public ResponseEntity<PublicScheduleAdminResDto> publicScheduleDetail(@PathVariable Long id) {
 		PublicScheduleAdminResDto publicScheduleAdminResDto = publicScheduleAdminService.detailPublicSchedule(id);
 		return ResponseEntity.ok(publicScheduleAdminResDto);
-
 	}
 }

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java

@@ -90,7 +90,7 @@ public PublicSchedule getPublicScheduleDetailRetrieve(Long scheduleId, Long user
 		User user = userRepository.getById(userId);
 		PublicSchedule publicRetrieveSchedule = publicScheduleRepository.findById(scheduleId)
 			.orElseThrow(() -> new NotExistException(ErrorCode.PUBLIC_SCHEDULE_NOT_FOUND));
-		checkAuthor(publicRetrieveSchedule.getAuthor(), user);
+		// checkAuthor(publicRetrieveSchedule.getAuthor(), user);
 		return publicRetrieveSchedule;
 	}
 

gg-calendar-api/src/main/java/gg/calendar/api/user/utils/controller/response/FortyTwoEventResponse.java

@@ -0,0 +1,75 @@
+package gg.calendar.api.user.utils.controller.response;
+
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class FortyTwoEventResponse {
+	private Long id;
+	private String name;
+	private String description;
+	private String location;
+	private String kind;
+
+	@JsonProperty("begin_at")
+	private LocalDateTime beginAt;
+
+	@JsonProperty("end_at")
+	private LocalDateTime endAt;
+
+	@JsonProperty("created_at")
+	private LocalDateTime createdAt;
+
+	@JsonProperty("updated_at")
+	private LocalDateTime updatedAt;
+
+	// @JsonProperty("max_people")
+	// private Integer maxPeople;
+	//
+	// @JsonProperty("nbr_subscribers")
+	// private Integer nbrSubscribers;
+
+	// @JsonProperty("campus_ids")
+	// private List<Integer> campusIds;
+	//
+	// @JsonProperty("cursus_ids")
+	// private List<Integer> cursusIds;
+
+	// @JsonProperty("prohibition_of_cancellation")
+	// private String prohibitionOfCancellation;
+
+	// private Waitlist waitlist;
+	// private List<Themes> themes;
+
+	// public static class Themes {
+	// 	private Long id;
+	// 	private String name;
+	// 	@JsonProperty("created_at")
+	// 	private LocalDateTime createdAt;
+	//
+	// 	@JsonProperty("updated_at")
+	// 	private LocalDateTime updatedAt;
+	// }
+	//
+	// public static class Waitlist {
+	// 	private Long id;
+	// 	@JsonProperty("created_at")
+	// 	private LocalDateTime createdAt;
+	//
+	// 	@JsonProperty("updated_at")
+	// 	private LocalDateTime updatedAt;
+	//
+	// 	@JsonProperty("waitlist_id")
+	// 	private Long waitlistId;
+	//
+	// 	@JsonProperty("waitlist_type")
+	// 	private String waitlistType;
+	// }
+
+}