github webhooks fix (#86)

Co-authored-by: berejmaj <maja.berej@orange.com>

Author: majaberej

backend/src/main/java/io/mixeway/mixewayflowapi/api/webhook/controller/GitHubWebhookController.java

@@ -1,40 +1,44 @@
 package io.mixeway.mixewayflowapi.api.webhook.controller;
 
 import ch.qos.logback.core.spi.ScanException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.mixeway.mixewayflowapi.api.webhook.dto.GHMergeEventDTO;
 import io.mixeway.mixewayflowapi.api.webhook.dto.GHPushEventDTO;
-import io.mixeway.mixewayflowapi.api.webhook.dto.GLMergeEventDTO;
-import io.mixeway.mixewayflowapi.api.webhook.dto.GLPushEventDTO;
 import io.mixeway.mixewayflowapi.api.webhook.service.GitHubWebhookService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
 @Validated
 @Log4j2
 public class GitHubWebhookController {
+
     private final GitHubWebhookService gitHubWebhookService;
+    private final ObjectMapper objectMapper;
+
+    @PostMapping(value = "/api/v1/webhook/github/push", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public ResponseEntity<?> pushEventGH(@RequestParam("payload") String payload)
+            throws ScanException, IOException, InterruptedException {
 
-    @PostMapping("/api/v1/webhook/github/push")
-    public ResponseEntity<?> pushEventGH(@RequestBody List<GHPushEventDTO> ghPushEventDTOS) throws ScanException, IOException, InterruptedException {
-        gitHubWebhookService.processPush(ghPushEventDTOS);
-        return new ResponseEntity<>(HttpStatus.OK);
+        GHPushEventDTO ghPushEventDTO = objectMapper.readValue(payload, GHPushEventDTO.class);
+        gitHubWebhookService.processPush(ghPushEventDTO);
+        return ResponseEntity.ok().build();
     }
 
-    @PostMapping("/api/v1/webhook/github/merge")
-    public ResponseEntity<?> mergeEventGH( @RequestBody GHMergeEventDTO ghMergeEventDTO) throws ScanException, IOException, InterruptedException {
+    @PostMapping(value = "/api/v1/webhook/github/merge", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public ResponseEntity<?> mergeEventGH(@RequestParam("payload") String payload)
+            throws ScanException, IOException, InterruptedException {
+
+        GHMergeEventDTO ghMergeEventDTO = objectMapper.readValue(payload, GHMergeEventDTO.class);
         log.info("[GitHub Merge] Merge event for {}", ghMergeEventDTO.getRepository().getId());
         gitHubWebhookService.processMerge(ghMergeEventDTO);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok().build();
     }
 }

backend/src/main/java/io/mixeway/mixewayflowapi/api/webhook/dto/GHMergeEventDTO.java

@@ -1,34 +1,51 @@
 package io.mixeway.mixewayflowapi.api.webhook.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GHMergeEventDTO {
+
+    private String action;
+    private Long number;
+
+    @JsonProperty("pull_request")
     private PullRequestDTO pullRequest;
+
     private RepositoryDTO repository;
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class PullRequestDTO {
         private Long id;
-        private HeadDTO head;
-        private BaseDTO base;
         private String state;
 
-        @Data
-        public static class HeadDTO {
-            private String ref;
-            private String sha;
-        }
-
-        @Data
-        public static class BaseDTO {
-            private String ref;
-            private String sha;
-        }
+        @JsonProperty("head")
+        private HeadBaseDTO head;
+
+        @JsonProperty("base")
+        private HeadBaseDTO base;
     }
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class HeadBaseDTO {
+        private String ref;
+        private String sha;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class RepositoryDTO {
         private Long id;
+        private String name;
+
+        @JsonProperty("full_name")
+        private String fullName;
+
+        @JsonProperty("default_branch")
+        private String defaultBranch;
     }
 }

backend/src/main/java/io/mixeway/mixewayflowapi/api/webhook/dto/GHPushEventDTO.java

@@ -1,17 +1,18 @@
 package io.mixeway.mixewayflowapi.api.webhook.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GHPushEventDTO {
     private String ref;
     private String after;
     private RepositoryDTO repository;
 
-
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class RepositoryDTO {
         private Long id;
-
     }
 }

backend/src/main/java/io/mixeway/mixewayflowapi/api/webhook/service/GitHubWebhookService.java

@@ -23,15 +23,18 @@ public class GitHubWebhookService {
     private final FindCodeRepoService findCodeRepoService;
     private final GetOrCreateCodeRepoBranchService getOrCreateCodeRepoBranchService;
 
-    public void processPush(List<GHPushEventDTO> ghPushEventDTOs) throws ScanException, IOException, InterruptedException {
-        GHPushEventDTO ghPushEventDTO;
-        if (ghPushEventDTOs != null && !ghPushEventDTOs.isEmpty()){
-            ghPushEventDTO = ghPushEventDTOs.get(0);
-            log.info("[GitHub Push] Push event for {} - {}", ghPushEventDTO.getRepository().getId(), ghPushEventDTO.getRef().replace("refs/heads/",""));
-            CodeRepo codeRepo = findCodeRepoService.findByRemoteId(ghPushEventDTO.getRepository().getId());
-            CodeRepoBranch codeRepoBranch = getOrCreateCodeRepoBranchService.getOrCreateCodeRepoBranch(ghPushEventDTO.getRef().replace("refs/heads/",""), codeRepo);
-            scanManagerService.scanRepository(codeRepo,codeRepoBranch, ghPushEventDTO.getAfter(),null);
+    public void processPush(GHPushEventDTO ghPushEventDTO) throws ScanException, IOException, InterruptedException {
+        if (ghPushEventDTO != null) {
+            log.info("[GitHub Push] Push event for {} - {}",
+                    ghPushEventDTO.getRepository().getId(),
+                    ghPushEventDTO.getRef().replace("refs/heads/",""));
 
+            CodeRepo codeRepo = findCodeRepoService.findByRemoteId(ghPushEventDTO.getRepository().getId());
+            CodeRepoBranch codeRepoBranch = getOrCreateCodeRepoBranchService.getOrCreateCodeRepoBranch(
+                    ghPushEventDTO.getRef().replace("refs/heads/",""),
+                    codeRepo
+            );
+            scanManagerService.scanRepository(codeRepo, codeRepoBranch, ghPushEventDTO.getAfter(), null);
         }
     }