Merge pull request #44 from OpsMx/OP-7544

Op 7544 - Add required query parameters in GATE service for audit client APIs
OpsMx · Sep 23, 2021 · 4b8236f · 4b8236f
2 parents 0a87c40 + 6ee2d56
commit 4b8236f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy b/...main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy
@@ -24,6 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RequestMapping("/auditclientservice")
@@ -55,9 +56,13 @@ class OpsmxAuditClientServiceController {
   Object getAuditClientResponse3(@PathVariable("version") String version,
                               @PathVariable("type") String type,
                               @PathVariable("source") String source,
-                              @PathVariable("source1") String source1) {
+                              @PathVariable("source1") String source1,
+                              @RequestParam(value = "isTreeView", required = false) Boolean isTreeView,
+                                 @RequestParam(value = "isLatest", required = false) Boolean isLatest,
+                              @RequestParam(value = "pageNo", required = false) Integer pageNo,
+                                 @RequestParam(value = "size", required = false) Integer size) {
 
-    return opsmxAuditClientService.getAuditClientResponse3(version, type, source, source1)
+    return opsmxAuditClientService.getAuditClientResponse3(version, type, source, source1, isTreeView, isLatest, pageNo, size)
   }
 
   @ApiOperation(value = "Endpoint for audit-client rest services")

diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy
@@ -18,6 +18,7 @@ package com.opsmx.spinnaker.gate.services
 
 import retrofit.http.GET
 import retrofit.http.Path
+import retrofit.http.Query
 
 interface OpsmxAuditClientService {
 
@@ -34,7 +35,11 @@ interface OpsmxAuditClientService {
   Object getAuditClientResponse3(@Path('version') String version,
                               @Path('type') String type,
                               @Path('source') String source,
-                              @Path('source1') String source1)
+                              @Path('source1') String source1,
+                              @Query("isTreeView") Boolean isTreeView,
+                                 @Query("isLatest") Boolean isLatest,
+                                 @Query("pageNo") Integer pageNo,
+                                 @Query("size") Integer size)
 
   @GET("/auditclientservice/{version}/{type}/{source}/{source1}/{source2}")
   Object getAuditClientResponse4(@Path('version') String version,