Remove unnecessary type

Author: joseivanlopez

rust/agama-manager/src/message.rs

@@ -19,8 +19,7 @@
 // find current contact information at www.suse.com.
 
 use agama_utils::actor::Message;
-use agama_utils::api::{Action, Config, Issue, Proposal, Scope, Status, SystemInfo};
-use std::collections::HashMap;
+use agama_utils::api::{Action, Config, IssueMap, Proposal, Status, SystemInfo};
 
 /// Gets the installation status.
 pub struct GetStatus;
@@ -99,7 +98,7 @@ impl Message for GetProposal {
 pub struct GetIssues;
 
 impl Message for GetIssues {
-    type Reply = HashMap<Scope, Vec<Issue>>;
+    type Reply = IssueMap;
 }
 
 /// Runs the given action.

rust/agama-manager/src/service.rs

@@ -23,12 +23,11 @@ use crate::message;
 use agama_utils::actor::{self, Actor, Handler, MessageHandler};
 use agama_utils::api::event;
 use agama_utils::api::status::State;
-use agama_utils::api::{Action, Config, Event, Issue, Proposal, Scope, Status, SystemInfo};
+use agama_utils::api::{Action, Config, Event, IssueMap, Proposal, Scope, Status, SystemInfo};
 use agama_utils::issue;
 use agama_utils::progress;
 use async_trait::async_trait;
 use merge_struct::merge;
-use std::collections::HashMap;
 use tokio::sync::broadcast;
 
 #[derive(Debug, thiserror::Error)]
@@ -187,10 +186,7 @@ impl MessageHandler<message::GetProposal> for Service {
 #[async_trait]
 impl MessageHandler<message::GetIssues> for Service {
     /// It returns the current proposal, if any.
-    async fn handle(
-        &mut self,
-        _message: message::GetIssues,
-    ) -> Result<HashMap<Scope, Vec<Issue>>, Error> {
+    async fn handle(&mut self, _message: message::GetIssues) -> Result<IssueMap, Error> {
         Ok(self.issues.call(issue::message::Get).await?)
     }
 }

rust/agama-server/src/server.rs

@@ -20,4 +20,3 @@
 
 pub mod web;
 pub use web::server_service;
-pub mod types;

rust/agama-server/src/server/types.rs

@@ -20,14 +20,13 @@
 
 //! This module implements Agama's HTTP API.
 
-use crate::server::types::IssuesMap;
 use agama_lib::error::ServiceError;
 use agama_manager as manager;
 use agama_manager::message;
 use agama_utils::actor::Handler;
 use agama_utils::api::config;
 use agama_utils::api::event;
-use agama_utils::api::{Action, Config, Status, SystemInfo};
+use agama_utils::api::{Action, Config, IssueMap, Status, SystemInfo};
 use anyhow;
 use axum::extract::State;
 use axum::response::{IntoResponse, Response};
@@ -222,13 +221,13 @@ async fn get_proposal(State(state): State<ServerState>) -> ServerResult<Response
     path = "/issues",
     context_path = "/api/v2",
     responses(
-        (status = 200, description = "Agama issues", body = IssuesMap),
+        (status = 200, description = "Agama issues", body = IssueMap),
         (status = 400, description = "Not possible to retrieve the issues")
     )
 )]
-async fn get_issues(State(state): State<ServerState>) -> ServerResult<Json<IssuesMap>> {
+async fn get_issues(State(state): State<ServerState>) -> ServerResult<Json<IssueMap>> {
     let issues = state.manager.call(message::GetIssues).await?;
-    let issues_map: IssuesMap = issues.into();
+    let issues_map: IssueMap = issues.into();
     Ok(Json(issues_map))
 }
 

rust/agama-server/src/server/web.rs

@@ -154,7 +154,6 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema_from::<agama_lib::users::RootUserSettings>()
             .schema_from::<agama_lib::users::UserPassword>()
             .schema_from::<agama_lib::users::UserSettings>()
-            .schema_from::<crate::server::types::IssuesMap>()
             .schema_from::<crate::software::web::SoftwareProposal>()
             .schema_from::<agama_utils::api::Status>()
             .schema_from::<agama_utils::api::status::State>()

rust/agama-server/src/web/docs/config.rs

@@ -34,7 +34,7 @@ pub mod status;
 pub use status::Status;
 
 pub mod issue;
-pub use issue::{Issue, IssueSeverity, IssueSource};
+pub use issue::{Issue, IssueMap, IssueSeverity, IssueSource};
 
 mod system_info;
 pub use system_info::SystemInfo;

rust/agama-utils/src/api.rs

@@ -18,9 +18,13 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
+use crate::api::scope::Scope;
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use strum::FromRepr;
 
+pub type IssueMap = HashMap<Scope, Vec<Issue>>;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("D-Bus conversion error")]

rust/agama-utils/src/api/issue.rs

@@ -19,14 +19,13 @@
 // find current contact information at www.suse.com.
 
 use crate::actor::Message;
-use crate::api::issue::Issue;
+use crate::api::issue::{Issue, IssueMap};
 use crate::api::Scope;
-use std::collections::HashMap;
 
 pub struct Get;
 
 impl Message for Get {
-    type Reply = HashMap<Scope, Vec<Issue>>;
+    type Reply = IssueMap;
 }
 
 // FIXME: consider an alternative approach to avoid pub(crate),

rust/agama-utils/src/issue/message.rs

@@ -22,11 +22,10 @@ use crate::actor::{self, Actor, MessageHandler};
 use crate::api::event;
 use crate::api::event::Event;
 use crate::api::issue;
-use crate::api::issue::Issue;
-use crate::api::scope::Scope;
+use crate::api::issue::IssueMap;
 use crate::issue::message;
 use async_trait::async_trait;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use tokio::sync::broadcast;
 
 #[derive(thiserror::Error, Debug)]
@@ -40,14 +39,14 @@ pub enum Error {
 }
 
 pub struct Service {
-    issues: HashMap<Scope, Vec<Issue>>,
+    issues: IssueMap,
     events: event::Sender,
 }
 
 impl Service {
     pub fn new(events: event::Sender) -> Self {
         Self {
-            issues: HashMap::new(),
+            issues: IssueMap::new(),
             events,
         }
     }
@@ -59,10 +58,7 @@ impl Actor for Service {
 
 #[async_trait]
 impl MessageHandler<message::Get> for Service {
-    async fn handle(
-        &mut self,
-        _message: message::Get,
-    ) -> Result<HashMap<Scope, Vec<Issue>>, Error> {
+    async fn handle(&mut self, _message: message::Get) -> Result<IssueMap, Error> {
         Ok(self.issues.clone())
     }
 }