Updating name references for library
This commit is contained in:
+14
-14
@@ -6,7 +6,7 @@ mod db_mgr {
|
||||
pub const LIMIT: usize = 6;
|
||||
|
||||
pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
|
||||
let tm_db_url = textsender_models::envy::environment::get_db_url().value;
|
||||
let tm_db_url = schedtxt_models::envy::environment::get_db_url().value;
|
||||
let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
|
||||
sqlx::PgPool::connect_with(tm_options).await
|
||||
}
|
||||
@@ -18,7 +18,7 @@ mod db_mgr {
|
||||
}
|
||||
|
||||
pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
|
||||
let db_url = textsender_models::envy::environment::get_db_url().value;
|
||||
let db_url = schedtxt_models::envy::environment::get_db_url().value;
|
||||
let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
|
||||
sqlx::PgPool::connect_with(options).await
|
||||
}
|
||||
@@ -77,7 +77,7 @@ mod db_mgr {
|
||||
}
|
||||
|
||||
pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
|
||||
let database_url = textsender_models::envy::environment::get_db_url().value;
|
||||
let database_url = schedtxt_models::envy::environment::get_db_url().value;
|
||||
let parsed_url = url::Url::parse(&database_url)?;
|
||||
|
||||
if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
|
||||
@@ -185,17 +185,17 @@ pub fn test_mer_response() -> serde_json::Value {
|
||||
}
|
||||
|
||||
pub async fn test_token() -> Result<String, josekit::JoseError> {
|
||||
let key: String = textsender_models::envy::environment::get_secret_main_key().value;
|
||||
let key: String = schedtxt_models::envy::environment::get_secret_main_key().value;
|
||||
let (message, issuer, audience) = token_fields();
|
||||
|
||||
let token_resource = textsender_models::token::TokenResource {
|
||||
let token_resource = schedtxt_models::token::TokenResource {
|
||||
message: message,
|
||||
issuer: issuer,
|
||||
audiences: vec![audience],
|
||||
user_id: TEST_USER_ID,
|
||||
};
|
||||
|
||||
match textsender_models::token::create_token(&key, token_resource, time::Duration::hours(1)) {
|
||||
match schedtxt_models::token::create_token(&key, token_resource, time::Duration::hours(1)) {
|
||||
Ok(access_token) => Ok(access_token.access_token),
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
@@ -372,7 +372,7 @@ mod request {
|
||||
"response": super::super::super::test_mer_response(),
|
||||
"user_id": user_id,
|
||||
"sent": sent,
|
||||
"status": textsender_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED,
|
||||
"status": schedtxt_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED,
|
||||
"contact_id": contact_id,
|
||||
"message_id": message_id
|
||||
});
|
||||
@@ -430,7 +430,7 @@ mod request {
|
||||
|
||||
let payload = serde_json::json!({
|
||||
"scheduled": scheduled,
|
||||
"status": textsender_models::message::scheduling::PENDING,
|
||||
"status": schedtxt_models::message::scheduling::PENDING,
|
||||
"user_id": super::super::super::TEST_USER_ID,
|
||||
});
|
||||
|
||||
@@ -683,7 +683,7 @@ async fn test_update_contact_names() {
|
||||
let (tm_pool, db_name, pool) = db_mgr::get_database_ready().await;
|
||||
let app = init::app(pool).await;
|
||||
|
||||
let mut opt_contact: Option<textsender_models::contact::Contact> = None;
|
||||
let mut opt_contact: Option<schedtxt_models::contact::Contact> = None;
|
||||
|
||||
// Send request
|
||||
match request::create_contact(&app).await {
|
||||
@@ -786,7 +786,7 @@ async fn test_create_message() {
|
||||
async fn test_get_message() {
|
||||
let (tm_pool, db_name, pool) = db_mgr::get_database_ready().await;
|
||||
let app = init::app(pool).await;
|
||||
let mut message_result: Option<textsender_models::message::Message> = None;
|
||||
let mut message_result: Option<schedtxt_models::message::Message> = None;
|
||||
|
||||
// Send request
|
||||
match request::message::create_message(&app).await {
|
||||
@@ -1239,7 +1239,7 @@ async fn test_update_scheduled_message_status() {
|
||||
match request::message::scheduling::update_scheduled_message_status(
|
||||
&app,
|
||||
&scheduled_message_id,
|
||||
textsender_models::message::scheduling::READY,
|
||||
schedtxt_models::message::scheduling::READY,
|
||||
)
|
||||
.await
|
||||
{
|
||||
@@ -1333,7 +1333,7 @@ async fn test_fetch_scheduled_message() {
|
||||
match request::message::scheduling::update_scheduled_message_status(
|
||||
&app,
|
||||
&scheduled_message_id,
|
||||
textsender_models::message::scheduling::READY,
|
||||
schedtxt_models::message::scheduling::READY,
|
||||
)
|
||||
.await
|
||||
{
|
||||
@@ -1443,7 +1443,7 @@ async fn test_record_message_event_response() {
|
||||
match request::message::scheduling::update_scheduled_message_status(
|
||||
&app,
|
||||
&scheduled_message_id,
|
||||
textsender_models::message::scheduling::READY,
|
||||
schedtxt_models::message::scheduling::READY,
|
||||
)
|
||||
.await
|
||||
{
|
||||
@@ -1580,7 +1580,7 @@ async fn test_get_message_event_response() {
|
||||
match request::message::scheduling::update_scheduled_message_status(
|
||||
&app,
|
||||
&scheduled_message_id,
|
||||
textsender_models::message::scheduling::READY,
|
||||
schedtxt_models::message::scheduling::READY,
|
||||
)
|
||||
.await
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user