Updated read me and added changes to the client file (#22)
* Added cpi methods
* Adding cpi methods
* Adding new admin related project
* Update README
* synced with airavata dependencies
* VerifiedNotification Manager
* Added client for notification module
* Adding reviewer and admin client
* Removing redudant dependies
* Removing redudant dependies
* Removing redudant dependies
* Removing redudant dependies
* Adding change to the admin client
* Update README
diff --git a/allocation-manager/README b/allocation-manager/README
index bcf263e..a271cee 100644
--- a/allocation-manager/README
+++ b/allocation-manager/README
@@ -6,11 +6,34 @@
* Reviewer - reviews the request and makes decision for allocation
* Admin - Initiates and manages the review process
+The allocation manager consists of the basic setup for the feature which will be continuously built on :
The airvata-allocation-manager is a multi-module consists of the the following modules:
* airvata-allocation-manager-server - This consists of details of the database connections and the entity classes.
* airvata-allocation-manager-stubs - This consists of the models which represent the database table entities and also the servicehandler.
The service handler (AllocationManagerServerHandler) functions interact with the database repository functions.
+The stubs consists of the client files which will be used to communicate to the micro-services.
+The AllocationManagerServerHandler.java file consists of all the functions which represent action by different roles involved in the feature.
+
+The allocation manager current consists of :
+
+* A user client and server
+* An admin client and server
+* An reviewer client and server.
+* A notification manager.
+
+The clients (present in stubs module) and server(present in server module) communicate using Apache Thrift with AllocationManagerServerHandler being the common part.
+
+Presently , The reviewer and admin are performing the following functions:
+
+* The reviewer performs can view the details of the request using the getAllocationRequest() function and thereby approve or deny.
+ The status is updated using updateAllocationRequestStatus().
+
+ * The admin performs can view the details of the request using the getAllocationRequest() function and the reviewers decision using getAllocationRequestStatus() and thereby approve or deny.
+ The status is updated using updateAllocationRequestStatus().
+
+
+1. The reviewer fetches
Currently, the implementation consists of a notification- manager
The notification manager of Allocation manager performs the functions of notifying the user/admin/reviewer the status of a request.
diff --git a/allocation-manager/airavata-allocation-manager/airavata-allocation-manager-stubs/src/main/java/org/apache/airavata/allocation/manager/client/AllocationManagerAdminClient.java b/allocation-manager/airavata-allocation-manager/airavata-allocation-manager-stubs/src/main/java/org/apache/airavata/allocation/manager/client/AllocationManagerAdminClient.java
index d4727bd..2cd65ba 100644
--- a/allocation-manager/airavata-allocation-manager/airavata-allocation-manager-stubs/src/main/java/org/apache/airavata/allocation/manager/client/AllocationManagerAdminClient.java
+++ b/allocation-manager/airavata-allocation-manager/airavata-allocation-manager-stubs/src/main/java/org/apache/airavata/allocation/manager/client/AllocationManagerAdminClient.java
@@ -23,8 +23,11 @@
client.updateAllocationRequestStatus(projectId, status);
} else if(requestType.equals("GET_REQUEST")){
client.getAllocationRequest(projectId);
+ } else if(requestType.equals("GET_REQUEST_STATUS")){
+ client.getAllocationRequestStatus(projectId);
}
+
transport.close();
} catch (TTransportException e) {
e.printStackTrace();
