index : license-api-rs.git

fd8f833803ce73194c6d5537c4d5c226093e9945 [patch]

6fa9dcfbf89b676880a0665413cf477e8b179d8d

0dc16a9da14eb4397dad7aad009c4447e3ab4e75

fd8f833803ce73194c6d5537c4d5c226093e9945.tar.gz

refactor: rename `errors` module to `messages` to match its purpose

Diff

 src/data.rs     |  2 +-
 src/errors.rs   | 40 ----------------------------------------
 src/main.rs     |  4 ++--
 src/messages.rs | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 82b673b..d152600 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
use std::str::FromStr;
use tide::log;

use crate::errors::{ErrorMsg, SuccessMsg};
use crate::messages::{ErrorMsg, SuccessMsg};

#[derive(Debug, Deserialize, Clone)]
pub struct LicenseDatabase {
diff --git a/src/errors.rs b/src/errors.rs
deleted file mode 100644
index 93184e7..0000000
--- a/src/errors.rs
+++ /dev/null
@@ -1,40 +0,0 @@
use std::fmt::Display;

#[derive(Debug)]
pub enum ErrorMsg {
    DatabaseError,
    NoLicensesAvailable,
    InvalidLicenseRequest,
    InvalidLicense,
    LicenseReadError,
}

impl Display for ErrorMsg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let message = match self {
            ErrorMsg::LicenseReadError => "Unable to read license file:",
            ErrorMsg::DatabaseError => "Unable to load or parse license database.",
            ErrorMsg::NoLicensesAvailable => "No licenses found.",
            ErrorMsg::InvalidLicenseRequest => {
                //TODO: make this not hardcoded
                "Invalid license. use the 'list' or 'list/all' endpoints to see defined licenses."
            }
            ErrorMsg::InvalidLicense => "Invalid license requested:",
        };
        write!(f, "{}", message)
    }
}

#[derive(Debug)]
pub enum SuccessMsg {
    DatabaseLoaded,
}

impl Display for SuccessMsg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let message = match self {
            SuccessMsg::DatabaseLoaded => "Database loaded successfully!",
        };
        write!(f, "{}", message)
    }
}
diff --git a/src/main.rs b/src/main.rs
index f3df657..3165e2a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,12 +8,12 @@ use tide::{http::mime, log, Response, Result, Server, StatusCode};
use crate::{
    config::{RunningConfig, ServerConfig},
    data::Queryable,
    errors::ErrorMsg,
    messages::ErrorMsg,
};

mod config;
mod data;
mod errors;
mod messages;

#[async_std::main]
async fn main() -> Result<()> {
diff --git a/src/messages.rs b/src/messages.rs
new file mode 100644
index 0000000..93184e7
--- /dev/null
+++ b/src/messages.rs
@@ -0,0 +1,40 @@
use std::fmt::Display;

#[derive(Debug)]
pub enum ErrorMsg {
    DatabaseError,
    NoLicensesAvailable,
    InvalidLicenseRequest,
    InvalidLicense,
    LicenseReadError,
}

impl Display for ErrorMsg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let message = match self {
            ErrorMsg::LicenseReadError => "Unable to read license file:",
            ErrorMsg::DatabaseError => "Unable to load or parse license database.",
            ErrorMsg::NoLicensesAvailable => "No licenses found.",
            ErrorMsg::InvalidLicenseRequest => {
                //TODO: make this not hardcoded
                "Invalid license. use the 'list' or 'list/all' endpoints to see defined licenses."
            }
            ErrorMsg::InvalidLicense => "Invalid license requested:",
        };
        write!(f, "{}", message)
    }
}

#[derive(Debug)]
pub enum SuccessMsg {
    DatabaseLoaded,
}

impl Display for SuccessMsg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let message = match self {
            SuccessMsg::DatabaseLoaded => "Database loaded successfully!",
        };
        write!(f, "{}", message)
    }
}