(airavata) branch agent-framewok-refactoring updated: included the gateway when fetching plans relevant for a user

[lahirujayathilake]

This is an automated email from the ASF dual-hosted git repository.

lahirujayathilake pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/agent-framewok-refactoring by 
this push:
     new c9b38971c7 included the gateway when fetching plans relevant for a user
c9b38971c7 is described below

commit c9b38971c7becbb5ae7c1b6850bdfa423cbbdcec
Author: lahiruj <lahirujayathil...@gmail.com>
AuthorDate: Mon Dec 9 03:33:11 2024 -0500

    included the gateway when fetching plans relevant for a user
---
 .../agent/connection/service/controllers/PlanController.java         | 5 ++---
 .../apache/airavata/agent/connection/service/db/repo/PlanRepo.java   | 2 +-
 .../airavata/agent/connection/service/handlers/PlanHandler.java      | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
index 939ff3ae7c..b24f6a667d 100644
--- 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
+++ 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
@@ -57,13 +57,12 @@ public class PlanController {
 
     @GetMapping("/user")
     public ResponseEntity<List<Plan>> getPlansByUserId() {
-        String userId = UserContext.username();
-        List<Plan> plans = planHandler.getAllPlansByUserId(userId);
+        List<Plan> plans = 
planHandler.getAllPlansByUserId(UserContext.username(), 
UserContext.gatewayId());
         return ResponseEntity.ok(plans);
     }
 
     @GetMapping("/{planId}")
-    public ResponseEntity<Plan> getPlanById(@PathVariable String planId) {
+    public ResponseEntity<Plan> getPlanById(@PathVariable("planId") String 
planId) {
         Plan plan = planHandler.getPlanById(planId);
         return ResponseEntity.ok(plan);
     }
diff --git 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/repo/PlanRepo.java
 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/repo/PlanRepo.java
index d8dc60c445..307cfc6e60 100644
--- 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/repo/PlanRepo.java
+++ 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/repo/PlanRepo.java
@@ -9,5 +9,5 @@ import java.util.List;
 @Repository
 public interface PlanRepo extends JpaRepository<Plan, String> {
 
-    List<Plan> findByUserId(String userId);
+    List<Plan> findAllByUserIdAndGatewayId(String userId, String gatewayId);
 }
diff --git 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/PlanHandler.java
 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/PlanHandler.java
index 283196a660..a8c17b6e1f 100644
--- 
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/PlanHandler.java
+++ 
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/PlanHandler.java
@@ -25,8 +25,8 @@ public class PlanHandler {
         return savedPlan;
     }
 
-    public List<Plan> getAllPlansByUserId(String userId) {
-        return planRepo.findByUserId(userId);
+    public List<Plan> getAllPlansByUserId(String userId, String gatewayId) {
+        return planRepo.findAllByUserIdAndGatewayId(userId, gatewayId);
     }
 
     public Plan getPlanById(String planId) {