fix v1 adapter

Worklytics · Oct 24, 2024 · 9e123d2 · 9e123d2
1 parent 76922b5
commit 9e123d2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/...s/src/main/java/co/worklytics/psoxy/aws/request/APIGatewayV1ProxyEventRequestAdapter.java b/...s/src/main/java/co/worklytics/psoxy/aws/request/APIGatewayV1ProxyEventRequestAdapter.java
@@ -25,12 +25,11 @@ public class APIGatewayV1ProxyEventRequestAdapter implements co.worklytics.psoxy
 
     @Override
     public String getPath() {
-        String resourcePath;
-        if (event.getRequestContext() != null) {
-            resourcePath = event.getRequestContext().getResourcePath();
-        } else {
-            resourcePath = ObjectUtils.firstNonNull(event.getResource(), event.getPath());
-        }
+        String resourcePath = event.getPath();
+
+        String route = event.getResource().replace("{proxy+}", "");
+
+        resourcePath = StringUtils.removeStart(resourcePath, "/" + event.getRequestContext().getStage()  + route);
 
         return StringUtils.prependIfMissing(resourcePath, "/");
     }

diff --git a/...c/test/java/co/worklytics/psoxy/aws/request/APIGatewayV1ProxyEventRequestAdapterTest.java b/...c/test/java/co/worklytics/psoxy/aws/request/APIGatewayV1ProxyEventRequestAdapterTest.java
@@ -51,4 +51,17 @@ public void parse_interesting() {
 
         assertFalse(requestAdapter.isHttps().isPresent());
     }
+
+    @SneakyThrows
+    @Test
+    public void parse_payload1_from_api_gateway_v2() {
+
+        APIGatewayProxyRequestEvent apiGatewayEvent = objectMapper.readerFor(APIGatewayProxyRequestEvent.class)
+            .readValue(TestUtils.getData("lambda-proxy-events/api-gateway-v2-payload-v1.json"));
+
+        APIGatewayV1ProxyEventRequestAdapter requestAdapter =
+            APIGatewayV1ProxyEventRequestAdapter.of(apiGatewayEvent);
+
+        assertEquals("/v2/report/meetings/NUXghb123TCj0bP6nPVe%252Fsg253D253D/participants", requestAdapter.getPath());
+    }
 }
diff --git a/java/impl/aws/src/test/resources/lambda-proxy-events/api-gateway-v2-payload-v1.json b/java/impl/aws/src/test/resources/lambda-proxy-events/api-gateway-v2-payload-v1.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0",
   "resource": "/psoxy-zoom/{proxy+}",
-  "path": "/live/ipsoxy-zoom/v2/report/meetings/NUXghb123TCj0bP6nPVe%252Fsg253D253D/participants",
+  "path": "/live/psoxy-zoom/v2/report/meetings/NUXghb123TCj0bP6nPVe%252Fsg253D253D/participants",
   "httpMethod": "GET",
   "headers": {
     "Content-Length": "0",