Refactor target_release_view

Author: plotnick

nexus/db-model/src/target_release.rs

@@ -6,6 +6,7 @@ use super::{impl_enum_type, Generation};
 use crate::schema::target_release;
 use crate::typed_uuid::DbTypedUuid;
 use chrono::{DateTime, Utc};
+use nexus_types::external_api::views;
 use omicron_uuid_kinds::TufRepoKind;
 
 impl_enum_type!(
@@ -62,4 +63,15 @@ impl TargetRelease {
             tuf_repo_id: Some(tuf_repo_id),
         }
     }
+
+    pub fn into_external(
+        &self,
+        release_source: views::TargetReleaseSource,
+    ) -> views::TargetRelease {
+        views::TargetRelease {
+            generation: (&self.generation.0).into(),
+            time_requested: self.time_requested,
+            release_source,
+        }
+    }
 }

nexus/db-queries/src/db/datastore/target_release.rs

@@ -77,38 +77,35 @@ impl DataStore {
             .authorize(authz::Action::Read, &authz::TARGET_RELEASE_CONFIG)
             .await?;
         let conn = self.pool_connection_authorized(opctx).await?;
-        Ok(views::TargetRelease {
-            generation: (&target_release.generation.0).into(),
-            time_requested: target_release.time_requested,
-            release_source: match target_release.release_source {
-                TargetReleaseSource::Unspecified => {
-                    views::TargetReleaseSource::Unspecified
+        let release_source = match target_release.release_source {
+            TargetReleaseSource::Unspecified => {
+                views::TargetReleaseSource::Unspecified
+            }
+            TargetReleaseSource::SystemVersion => {
+                use crate::db::schema::tuf_repo;
+                if let Some(tuf_repo_id) = target_release.tuf_repo_id {
+                    views::TargetReleaseSource::SystemVersion(
+                        tuf_repo::table
+                            .select(tuf_repo::system_version)
+                            .filter(tuf_repo::id.eq(tuf_repo_id))
+                            .first_async::<SemverVersion>(&*conn)
+                            .await
+                            .map_err(|e| {
+                                public_error_from_diesel(
+                                    e,
+                                    ErrorHandler::Server,
+                                )
+                            })?
+                            .into(),
+                    )
+                } else {
+                    return Err(Error::invalid_request(
+                        "missing TUF repo ID for specified system version",
+                    ));
                 }
-                TargetReleaseSource::SystemVersion => {
-                    use crate::db::schema::tuf_repo;
-                    if let Some(tuf_repo_id) = target_release.tuf_repo_id {
-                        views::TargetReleaseSource::SystemVersion(
-                            tuf_repo::table
-                                .select(tuf_repo::system_version)
-                                .filter(tuf_repo::id.eq(tuf_repo_id))
-                                .first_async::<SemverVersion>(&*conn)
-                                .await
-                                .map_err(|e| {
-                                    public_error_from_diesel(
-                                        e,
-                                        ErrorHandler::Server,
-                                    )
-                                })?
-                                .into(),
-                        )
-                    } else {
-                        return Err(Error::invalid_request(
-                            "missing TUF repo ID for specified system version",
-                        ));
-                    }
-                }
-            },
-        })
+            }
+        };
+        Ok(target_release.into_external(release_source))
     }
 }