get projects list works

Author: david-crespo

omicron-common/src/api/external/mod.rs

@@ -43,6 +43,7 @@ pub type CreateResult<T> = Result<T, Error>;
 pub type DeleteResult = Result<(), Error>;
 /** Result of a list operation that returns an ObjectStream */
 pub type ListResult<T> = Result<ObjectStream<T>, Error>;
+pub type ListResultVec<T> = Result<Vec<T>, Error>;
 /** Result of a lookup operation for the specified type */
 pub type LookupResult<T> = Result<T, Error>;
 /** Result of an update operation for the specified type */

omicron-nexus/src/db/datastore.rs

@@ -54,7 +54,6 @@ use super::sql::SqlString;
 use super::sql::SqlValueSet;
 use super::sql::Table;
 use super::sql_operations::sql_fetch_page_by;
-use super::sql_operations::sql_fetch_page_from_table;
 use super::sql_operations::sql_fetch_row_by;
 use super::sql_operations::sql_fetch_row_raw;
 use super::sql_operations::sql_insert;
@@ -125,34 +124,6 @@ impl DataStore {
         sql_row_value(&row, "id")
     }
 
-    /// List a page of projects by id
-    pub async fn projects_list_by_id(
-        &self,
-        pagparams: &DataPageParams<'_, Uuid>,
-    ) -> ListResult<db::model::Project> {
-        let client = self.pool.acquire().await?;
-        sql_fetch_page_from_table::<LookupByUniqueId, Project>(
-            &client,
-            (),
-            pagparams,
-        )
-        .await
-    }
-
-    /// List a page of projects by name
-    pub async fn projects_list_by_name(
-        &self,
-        pagparams: &DataPageParams<'_, Name>,
-    ) -> ListResult<db::model::Project> {
-        let client = self.pool.acquire().await?;
-        sql_fetch_page_by::<
-            LookupByUniqueName,
-            Project,
-            <Project as Table>::Model,
-        >(&client, (), pagparams, Project::ALL_COLUMNS)
-        .await
-    }
-
     /// Updates a project by name (clobbering update -- no etag)
     pub async fn project_update(
         &self,

omicron-nexus/src/db/sql_operations.rs

@@ -67,26 +67,6 @@ where
     R::Model::try_from(&row)
 }
 
-/// Fetch a page of rows from a table using the specified lookup
-pub async fn sql_fetch_page_from_table<'a, L, T>(
-    client: &'a tokio_postgres::Client,
-    scope_key: L::ScopeKey,
-    pagparams: &'a DataPageParams<'a, L::ItemKey>,
-) -> ListResult<T::Model>
-where
-    L: LookupKey<'a, T>,
-    L::ScopeKey: 'a,
-    T: Table,
-{
-    sql_fetch_page_by::<L, T, T::Model>(
-        client,
-        scope_key,
-        pagparams,
-        T::ALL_COLUMNS,
-    )
-    .await
-}
-
 /// Like `fetch_page_from_table`, but the caller can specify which columns
 /// to select and how to interpret the row
 pub async fn sql_fetch_page_by<'a, L, T, R>(

omicron-nexus/src/http_entrypoints_external.rs

@@ -163,21 +163,21 @@ async fn projects_get(
     let params = ScanByNameOrId::from_query(&query)?;
     let field = pagination_field_for_scan_params(params);
 
-    let project_stream = match field {
+    let projects = match field {
         PagField::Id => {
             let page_selector = data_page_params_nameid_id(&rqctx, &query)?;
-            nexus.projects_list_by_id(&page_selector).await?
+            nexus.projects_list_by_id(&page_selector)?
         }
 
         PagField::Name => {
             let page_selector = data_page_params_nameid_name(&rqctx, &query)?;
-            nexus.projects_list_by_name(&page_selector).await?
+            nexus.projects_list_by_name(&page_selector)?
         }
     };
 
-    let view_list =
-        to_list::<db::model::Project, Project>(project_stream).await;
-    Ok(HttpResponseOk(ScanByNameOrId::results_page(&query, view_list)?))
+    // TODO filter out non-ok things like to_list does
+    let projects = projects.into_iter().map(|p| p.into()).collect();
+    Ok(HttpResponseOk(ScanByNameOrId::results_page(&query, projects)?))
 }
 
 /**

omicron-nexus/src/nexus.rs

@@ -26,6 +26,7 @@ use omicron_common::api::external::IdentityMetadataCreateParams;
 use omicron_common::api::external::InstanceCreateParams;
 use omicron_common::api::external::InstanceState;
 use omicron_common::api::external::ListResult;
+use omicron_common::api::external::ListResultVec;
 use omicron_common::api::external::LookupResult;
 use omicron_common::api::external::Name;
 use omicron_common::api::external::ProjectCreateParams;
@@ -346,18 +347,36 @@ impl Nexus {
             .map_err(|e| e.into())
     }
 
-    pub async fn projects_list_by_name(
+    pub fn projects_list_by_name(
         &self,
         pagparams: &DataPageParams<'_, Name>,
-    ) -> ListResult<db::model::Project> {
-        self.db_datastore.projects_list_by_name(pagparams).await
+    ) -> ListResultVec<db::model::DieselProject> {
+        use db::diesel_schema::project::dsl::*;
+        let conn = self.dpool.get().unwrap();
+        // TODO these are incompatible arm types
+        // let order = match pagparams.direction {
+        //     PaginationOrder::Ascending => name.asc(),
+        //     PaginationOrder::Descending => name.desc(),
+        // };
+        project
+            .limit(pagparams.limit.get().into())
+            .order(name.asc())
+            .load::<db::model::DieselProject>(&*conn)
+            .map_err(|e| e.into())
     }
 
-    pub async fn projects_list_by_id(
+    pub fn projects_list_by_id(
         &self,
         pagparams: &DataPageParams<'_, Uuid>,
-    ) -> ListResult<db::model::Project> {
-        self.db_datastore.projects_list_by_id(pagparams).await
+    ) -> ListResultVec<db::model::DieselProject> {
+        use db::diesel_schema::project::dsl::*;
+        let conn = self.dpool.get().unwrap();
+        // TODO figure out order here too
+        project
+            .limit(pagparams.limit.get().into())
+            .order(id.asc())
+            .load::<db::model::DieselProject>(&*conn)
+            .map_err(|e| e.into())
     }
 
     pub async fn project_delete(&self, name: &Name) -> DeleteResult {

omicron-nexus/tests/test_projects.rs

@@ -5,6 +5,7 @@ use omicron_common::api::external::ProjectCreateParams;
 use std::convert::TryFrom;
 
 use dropshot::test_util::object_get;
+use dropshot::test_util::objects_list_page;
 use dropshot::test_util::objects_post;
 use dropshot::test_util::ClientTestContext;
 
@@ -32,6 +33,13 @@ async fn test_projects() {
     let project: Project = object_get(&client, &p2_url).await;
     assert_eq!(project.identity.name, p2_name);
 
+    let projects =
+        objects_list_page::<Project>(client, "/projects").await.items;
+    assert_eq!(projects.len(), 2);
+    // alphabetical order for now
+    assert_eq!(projects[0].identity.name, p2_name);
+    assert_eq!(projects[1].identity.name, p1_name);
+
     cptestctx.teardown().await;
 }