Merge pull request #30 from filecoin-project/endpoint/get-merged-appl…

…ications

Endpoint/get merged applications

http-server/src/main.rs

@@ -14,6 +14,7 @@ pub(crate) mod router;
 ///    - Propose Application
 ///    - Approve Application
 ///    - Merge Application
+///    - Get All Merged Applications
 ///    - Get Application
 ///    - Get All Applications
 /// Blockchain endpoints:
@@ -43,6 +44,7 @@ async fn main() -> std::io::Result<()> {
             .service(router::application::propose_application)
             .service(router::application::approve_application)
             .service(router::application::merge_application)
+            .service(router::application::get_merged_applications)
             .service(router::application::get_application)
             .service(router::application::get_all_applications)
             .service(router::blockchain::address_allowance)

http-server/src/router/application.rs

@@ -1,5 +1,8 @@
 use actix_web::{get, post, web, HttpResponse, Responder};
-use lib::core::{CreateApplicationInfo, LDNApplication, CompleteGovernanceReviewInfo, CompleteNewApplicationProposalInfo};
+use lib::core::{
+    CompleteGovernanceReviewInfo, CompleteNewApplicationProposalInfo, CreateApplicationInfo,
+    LDNApplication,
+};
 
 /// Create a new application.
 ///
@@ -258,6 +261,34 @@ pub async fn get_all_applications() -> actix_web::Result<impl Responder> {
     Ok(HttpResponse::Ok().body(serde_json::to_string_pretty(&apps).unwrap()))
 }
 
+// Fetch merged applications
+///
+/// # Returns
+/// Returns an array of contents of the files.
+///
+/// # Example
+/// ```plaintext
+/// curl http://localhost:8080/application/files
+/// ```
+///
+/// # Response
+/// ```json
+/// [
+///   "file content 1",
+///   "file content 2",
+///   ...
+/// ]
+/// ```
+#[get("/applications/merged")]
+pub async fn get_merged_applications() -> actix_web::Result<impl Responder> {
+    match LDNApplication::get_merged_applications().await {
+        Ok(apps) => Ok(HttpResponse::Ok().body(serde_json::to_string_pretty(&apps).unwrap())),
+        Err(e) => {
+            return Ok(HttpResponse::InternalServerError().body(e.to_string()));
+        }
+    }
+}
+
 /// Check the health status.
 ///
 /// # Example

lib/Cargo.toml

@@ -22,3 +22,4 @@ chrono = "0.4.26"
 base64 = "0.13"
 reqwest = { version = "0.11.18", features = ["json"] }
 futures = "0.3.28"
+tokio = { version = "1.32.0", features = ["rt", "macros"] }

lib/src/core/application/core_info.rs

@@ -10,6 +10,7 @@ pub struct ApplicationInfo {
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 pub struct ApplicationCoreInfo {
     pub data_owner_name: String,
+    pub data_owner_github_handle: String,
     pub data_owner_region: String,
     pub data_owner_industry: String,
     pub data_owner_address: String,
@@ -22,6 +23,7 @@ impl ApplicationCoreInfo {
     pub fn new(
         data_owner_name: String,
         data_owner_region: String,
+        data_owner_github_handle: String,
         data_owner_industry: String,
         data_owner_address: String,
         requested_amount: String,
@@ -31,6 +33,7 @@ impl ApplicationCoreInfo {
         ApplicationCoreInfo {
             data_owner_name,
             data_owner_region,
+            data_owner_github_handle,
             data_owner_address,
             requested_amount,
             data_owner_industry,