Skip to content

Commit

Permalink
chore: Delete SuperpositionUser trait (#251)
Browse files Browse the repository at this point in the history
  • Loading branch information
ayushjain17 authored Sep 30, 2024
1 parent 8b68900 commit e77ae0b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 30 deletions.
2 changes: 1 addition & 1 deletion crates/context_aware_config/src/api/context/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use serde_json::{from_value, json, Map, Value};
use service_utils::helpers::{parse_config_tags, validation_err_to_str};
use service_utils::service::types::DbConnection;
use std::collections::HashMap;
use superposition_types::{SuperpositionUser, User};
use superposition_types::User;

use super::helpers::{
validate_condition_with_functions, validate_condition_with_mandatory_dimensions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use service_utils::{
use superposition_macros::{
bad_argument, db_error, not_found, unexpected_error, validation_error,
};
use superposition_types::{result as superposition, SuperpositionUser, User};
use superposition_types::{result as superposition, User};

use crate::{
api::{
Expand Down
2 changes: 1 addition & 1 deletion crates/context_aware_config/src/api/dimension/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use diesel::{
use jsonschema::{Draft, JSONSchema};
use serde_json::Value;
use superposition_macros::{bad_argument, not_found, unexpected_error};
use superposition_types::{result as superposition, SuperpositionUser, User};
use superposition_types::{result as superposition, User};

use service_utils::service::types::{AppState, DbConnection, Tenant};

Expand Down
2 changes: 1 addition & 1 deletion crates/context_aware_config/src/api/functions/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use serde_json::json;
use service_utils::service::types::DbConnection;

use superposition_macros::{bad_argument, not_found, unexpected_error};
use superposition_types::{result as superposition, SuperpositionUser, User};
use superposition_types::{result as superposition, User};

use validation_functions::{compile_fn, execute_fn};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ use service_utils::service::types::{
AppHeader, AppState, CustomHeaders, DbConnection, Tenant,
};
use superposition_macros::{bad_argument, response_error, unexpected_error};
use superposition_types::{
result as superposition, Condition, Exp, Overrides, SuperpositionUser, User,
};
use superposition_types::{result as superposition, Condition, Exp, Overrides, User};

use super::{
helpers::{
Expand Down
28 changes: 5 additions & 23 deletions crates/superposition_types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ use regex::Regex;
use serde::{Deserialize, Deserializer, Serialize};
use serde_json::{json, Map, Value};

pub trait SuperpositionUser {
fn get_email(&self) -> String;
fn get_username(&self) -> String;
fn get_auth_token(&self) -> String;
fn get_auth_type(&self) -> String;
}

#[derive(Debug, Clone)]
pub struct User {
pub email: String,
Expand All @@ -27,20 +20,20 @@ pub struct User {
pub auth_type: String,
}

impl SuperpositionUser for User {
fn get_email(&self) -> String {
impl User {
pub fn get_email(&self) -> String {
self.email.clone()
}

fn get_username(&self) -> String {
pub fn get_username(&self) -> String {
self.username.clone()
}

fn get_auth_token(&self) -> String {
pub fn get_auth_token(&self) -> String {
self.auth_token.clone()
}

fn get_auth_type(&self) -> String {
pub fn get_auth_type(&self) -> String {
self.auth_type.clone()
}
}
Expand All @@ -56,17 +49,6 @@ impl Default for User {
}
}

impl From<Box<dyn SuperpositionUser>> for User {
fn from(value: Box<dyn SuperpositionUser>) -> Self {
User {
email: value.get_email(),
username: value.get_username(),
auth_token: value.get_auth_token(),
auth_type: value.get_auth_type(),
}
}
}

impl FromRequest for User {
type Error = actix_web::error::Error;
type Future = Ready<Result<Self, Self::Error>>;
Expand Down

0 comments on commit e77ae0b

Please sign in to comment.