-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from polywrap/main
Main to develop
- Loading branch information
Showing
17 changed files
with
195 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "gateway_service" | ||
version = "0.1.3" | ||
version = "0.1.4" | ||
edition = "2021" | ||
|
||
[dependencies] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
gateway/rust/gateway_service/src/functions/package_info.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
use axum::http::StatusCode; | ||
|
||
use crate::{ | ||
debug, | ||
http_utils::internal_server_error, | ||
models::{Package, PackageName, Username}, | ||
resolving::{get_package, GetPackageError}, | ||
Repository, | ||
}; | ||
|
||
pub async fn package_info( | ||
user: String, | ||
package: String, | ||
package_repo: &impl Repository<Package>, | ||
) -> Result<String, StatusCode> { | ||
debug!(&user, &package); | ||
|
||
let username: Username = user.parse().map_err(internal_server_error)?; | ||
|
||
let package_name: PackageName = package.parse().map_err(internal_server_error)?; | ||
|
||
let package = get_package(&username, &package_name, package_repo) | ||
.await | ||
.map_err(|e| match e { | ||
GetPackageError::PackageNotFound => StatusCode::NOT_FOUND, | ||
GetPackageError::RepositoryError(e) => internal_server_error(e), | ||
})?; | ||
|
||
Ok(serde_json::to_string_pretty(&package).map_err(internal_server_error)?) | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use async_trait::async_trait; | ||
use mockall::{mock, predicate::eq}; | ||
|
||
use crate::{functions::package_info, Package, Repository, RepositoryError, Version}; | ||
|
||
mock! { | ||
PackageRepository {} | ||
#[async_trait] | ||
impl Repository<Package> for PackageRepository { | ||
async fn read(&self, key: &str) -> Result<Package, RepositoryError>; | ||
async fn update(&self, entity: &Package) -> Result<(), RepositoryError>; | ||
} | ||
} | ||
|
||
#[tokio::test] | ||
async fn can_get_package_info() { | ||
let mut package_repo = MockPackageRepository::new(); | ||
|
||
let package = Package { | ||
id: "user1/package1".into(), | ||
name: "package1".parse().unwrap(), | ||
user: "user1".parse().unwrap(), | ||
versions: vec![ | ||
Version { | ||
name: "1.0.0".into(), | ||
uri: "test/uri0".parse().unwrap(), | ||
created_on: 0, | ||
}, | ||
Version { | ||
name: "1.0.1".into(), | ||
uri: "test/uri1".parse().unwrap(), | ||
created_on: 0, | ||
}, | ||
Version { | ||
name: "1.0.2".into(), | ||
uri: "test/uri2".parse().unwrap(), | ||
created_on: 0, | ||
}, | ||
], | ||
created_on: 0, | ||
}; | ||
|
||
{ | ||
let package = package.clone(); | ||
package_repo | ||
.expect_read() | ||
.with(eq("user1/package1".to_string())) | ||
.return_once(move |_| Ok(package)); | ||
} | ||
|
||
let result = package_info("user1".into(), "package1".into(), &package_repo) | ||
.await | ||
.unwrap(); | ||
|
||
assert_eq!(result, serde_json::to_string_pretty(&package).unwrap()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
use std::fmt::Display; | ||
|
||
use crate::{ | ||
models::{Package, PackageName, Username}, | ||
Repository, RepositoryError, | ||
}; | ||
|
||
pub async fn get_package( | ||
user: &Username, | ||
package_name: &PackageName, | ||
package_repo: &impl Repository<Package>, | ||
) -> Result<Package, GetPackageError> { | ||
let id = format!("{}/{}", user, package_name); | ||
|
||
let package = package_repo.read(&id).await.map_err(|error| match error { | ||
RepositoryError::NotFound => GetPackageError::PackageNotFound, | ||
RepositoryError::Unknown(e) => GetPackageError::RepositoryError(e), | ||
})?; | ||
|
||
Ok(package) | ||
} | ||
|
||
#[derive(Debug, thiserror::Error, PartialEq, Clone)] | ||
pub enum GetPackageError { | ||
PackageNotFound, | ||
RepositoryError(String), | ||
} | ||
impl Display for GetPackageError { | ||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
match self { | ||
GetPackageError::PackageNotFound => write!(f, "Package not found"), | ||
GetPackageError::RepositoryError(e) => write!(f, "Repository error: {}", e), | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
use axum::extract::{Path, State}; | ||
use http::StatusCode; | ||
|
||
use crate::{functions, models::Package, Repository}; | ||
|
||
use super::Dependencies; | ||
|
||
pub async fn package_info<T>( | ||
Path((user, package)): Path<(String, String)>, | ||
State(deps): State<Dependencies<T>>, | ||
) -> Result<String, StatusCode> | ||
where | ||
T: Repository<Package>, | ||
{ | ||
let Dependencies { package_repo } = deps; | ||
|
||
let info = functions::package_info(user, package, &package_repo).await?; | ||
|
||
Ok(info) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters