From 4043c59f36a5726034fdcaed58c0ccede83f16fb Mon Sep 17 00:00:00 2001
From: Nicholas Caughey <ncaughey@redhat.com>
Date: Thu, 22 Jun 2023 15:21:13 +0100
Subject: [PATCH] removed currently unused code and added in the ability to
 check which build type is submitted

---
 src/main/java/rest/CreateGetResource.java | 61 -----------------------
 src/main/java/rest/CreateScanRequest.java | 27 ++++++----
 2 files changed, 16 insertions(+), 72 deletions(-)
 delete mode 100644 src/main/java/rest/CreateGetResource.java

diff --git a/src/main/java/rest/CreateGetResource.java b/src/main/java/rest/CreateGetResource.java
deleted file mode 100644
index 6a9cc90..0000000
--- a/src/main/java/rest/CreateGetResource.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// package rest;
-
-// import java.util.Collections;
-// import java.util.LinkedHashMap;
-// import java.util.Set;
-
-// import dto.ScanObj;
-// import dto.ConnectDB;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-
-// import javax.ws.rs.GET;
-// import javax.ws.rs.Path;
-// import javax.ws.rs.PathParam;
-// import java.sql.Connection;
-// import java.sql.PreparedStatement;
-// import java.sql.ResultSet;
-// import java.sql.SQLException;
-
-// import io.quarkus.security.Authenticated;
-
-// // @Path("/api/v1/[osh-scan]")
-// @Path("/scanGet")
-// @Authenticated
-// public class CreateGetResource {
-
-//     private static final Logger logger = LoggerFactory.getLogger(CreateGetResource.class);
-
-//     CreateScanService createScanService;
-
-//     private Set<ScanObj> Scans = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
-
-//     public CreateGetResource() {
-//         // LDB: @TODO either put some code here or remove this not used public constructor
-//     }
-
-//     @GET
-//     @Path("/{scanId}")
-//     public Set<ScanObj> list(@PathParam("scanId") String scanId) {
-//         //use to return specific scanIds just use usual fetch from sets, will be querying hte db directly here
-//         ConnectDB connectDB = new ConnectDB();
-//         String sql = "SELECT * FROM scans WHERE scan_id=?";
-//         try(Connection conn = connectDB.connect();
-//             PreparedStatement pstmt = conn.prepareStatement(sql)) {
-//             pstmt.setString(1, scanId);
-//             ResultSet rs = pstmt.executeQuery();
-//             while (rs.next()) {
-//                 //very ugly solution needs some change to where we put the query
-//                 Scans.add(new ScanObj(
-//                         rs.getString("scan_id"),
-//                         rs.getString("offering_id"),
-//                         rs.getString("event_id"),
-//                         rs.getString("is_managed_service"),
-//                         rs.getString("component_list")));
-//             }
-//         } catch (SQLException e) {
-//             logger.error(e.getMessage());
-//         }
-//         return Scans;
-//     }
-// }
diff --git a/src/main/java/rest/CreateScanRequest.java b/src/main/java/rest/CreateScanRequest.java
index 4e2f346..72c15d1 100644
--- a/src/main/java/rest/CreateScanRequest.java
+++ b/src/main/java/rest/CreateScanRequest.java
@@ -7,6 +7,7 @@ import dto.GitObj;
 import dto.GitObjPayload;
 import dto.PncObj;
 import dto.PncObjPayload;
+// import dto.NewScanObj;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.json.JSONException;
@@ -33,12 +34,22 @@ public class CreateScanRequest {
 
     @RestClient
     CreateScanService createScanService;
-    GreetingResource greetingResource;
+    TektonPipeline tektonPipeline;
 
     @POST
-    @Path("/brew")
     @Consumes({ "application/json" })
     // in theory should take List<String> to clean it up
+    public void invokeScanAnalyze(@Valid String scanInvocation) throws JSONException {
+        JSONObject jsonData = new JSONObject(scanInvocation);
+        if(jsonData.getString("buildSystemType")=="brew"){
+            invokeBrewScanAnalyze(scanInvocation);
+        } else if(jsonData.getString("buildSystemType")=="pnc"){
+            invokeGitScanAnalyze(scanInvocation);
+        } else if(jsonData.getString("buildSystemType")=="git"){
+            invokePncScanAnalyze(scanInvocation);
+        }
+    }
+    
     public BrewObj invokeBrewScanAnalyze(@Valid String scanInvocation) throws JSONException {
         JSONObject jsonData = new JSONObject(scanInvocation);
         BrewObj brewObj = BrewObjPayload.constructScanPayload(jsonData);
@@ -56,14 +67,11 @@ public class CreateScanRequest {
         } catch (SQLException e) {
             logger.error(e.getMessage());
         } 
-        greetingResource.invokeScanTask(brewObj.getBrewNvr());
+        tektonPipeline.invokeScanTask(brewObj.getBrewNvr());
         return brewObj;
     }
 
-    @POST
-    @Path("/git")
-    @Consumes({ "application/json" })
-    public void invokeGitScanAnalyze(@Valid String scanInvocation)throws URISyntaxException {
+    public void invokeGitScanAnalyze(@Valid String scanInvocation)throws JSONException {
         throw new UnsupportedOperationException("unImplemented fucntionality");
 
         // JSONObject jsonData = new JSONObject(scanInvocation);
@@ -83,10 +91,7 @@ public class CreateScanRequest {
         // return gitObj;
     }
 
-    @POST
-    @Path("/pnc")
-    @Consumes({ "application/json" })
-    public void invokePncScanAnalyze(@Valid String scanInvocation)throws URISyntaxException {
+    public void invokePncScanAnalyze(@Valid String scanInvocation)throws JSONException {
         throw new UnsupportedOperationException("unImplemented fucntionality");
         // JSONObject jsonData = new JSONObject(scanInvocation);
         // PncObj pncObj = PncObjPayload.constructScanPayload(jsonData);