chris
/
jean-marie
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored to move wishlist code to separate file

This commit is contained in:
Chris Jean-Marie 2024-10-28 15:27:43 +00:00
parent f3bc62e4c0
commit 7c79e6ea06
7 changed files with 210 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/migrations/20241028023107_wishlist_add_received.down.sql Normal file
View File

@ -0,0 +1,2 @@
-- Add down migration script here
alter table wishlist_items drop column received_at;

2
backend/migrations/20241028023107_wishlist_add_received.up.sql Normal file
View File

@ -0,0 +1,2 @@
-- Add up migration script here
alter table wishlist_items add column received_at integer null;

4
backend/src/main.rs
View File

@ -11,12 +11,14 @@ mod google_oauth;
mod middlewares;
mod routes;
mod user;
mod wishlist;
use error_handling::AppError;
use middlewares::inject_user_data;
use google_oauth::{login, logout, google_auth_return};
use routes::{about, contact, cottagecalendar, dashboard, index, profile, user_profile, user_wishlist, user_wishlist_add, user_wishlist_add_item, useradmin, wishlists};
use routes::{about, contact, cottagecalendar, dashboard, index, profile, user_profile, useradmin};
use user::{add_user_role, delete_user_role, UserData};
use wishlist::{user_wishlist, user_wishlist_add, user_wishlist_add_item, wishlists};
#[derive(Clone)]
pub struct AppState {

158
backend/src/routes.rs
View File

@ -2,16 +2,14 @@ use askama_axum::{Response, Template};
use axum::{
extract::{Path, State},
response::{Html, IntoResponse, Redirect},
Extension, Form,
Extension,
};
use chrono::Utc;
use http::StatusCode;
use serde::Deserialize;
use sqlx::SqlitePool;
use crate::{
middlewares::is_authorized,
user::{get_other_roles_display, get_user_roles_display, get_user_wishlist_items},
user::{get_other_roles_display, get_user_roles_display},
UserData,
};
@ -251,155 +249,3 @@ pub async fn cottagecalendar(
Redirect::to("/").into_response()
}
}
#[derive(Template)]
#[template(path = "userwishlists.html")]
struct WishListsTemplate {
logged_in: bool,
name: String,
users: Vec<UserData>,
}
pub async fn wishlists(
Extension(user_data): Extension<Option<UserData>>,
State(db_pool): State<SqlitePool>,
) -> impl IntoResponse {
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_name.is_some();
let name = user_name.unwrap_or_default();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool)
.await
.unwrap();
if is_authorized("/userwishlists", user_data, db_pool).await {
let template = WishListsTemplate {
logged_in,
name,
users,
};
HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
}
#[derive(Template)]
#[template(path = "userwishlist.html")]
struct UserWishListTemplate {
logged_in: bool,
name: String,
user: UserData,
user_wishlist_items: Vec<crate::user::UserWishlistItem>,
}
pub async fn user_wishlist(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
// Extract the user's name from the user data.
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user data.
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool)
.await
.unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user roles
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Create the wishlist template.
let template = UserWishListTemplate {
logged_in,
name,
user: user,
user_wishlist_items,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
}
#[derive(Template)]
#[template(path = "userwishlistadd.html")]
struct UserWishListAddTemplate {
logged_in: bool,
name: String,
user: UserData,
user_wishlist_items: Vec<crate::user::UserWishlistItem>,
}
pub async fn user_wishlist_add(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
// Extract the user's name from the user data.
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user data.
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool)
.await
.unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user roles
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Create the wishlist template.
let template = UserWishListAddTemplate {
logged_in,
name,
user: user,
user_wishlist_items,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
}
#[derive(Deserialize, Debug)]
pub struct ItemForm {
item: String,
item_url: String,
}
pub async fn user_wishlist_add_item(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
Form(item_form): Form<ItemForm>
) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Insert new item to database
let now = Utc::now().timestamp();
sqlx::query("insert into wishlist_items (created_at, created_by, updated_at, updated_by, user_id, item, item_url) values (?, ?, ?, ?, ?, ?, ?)")
.bind(now)// Created now
.bind(user_data.as_ref().unwrap().id)// Created by current user
.bind(now) // Updated now
.bind(user_data.as_ref().unwrap().id) // Updated by current user
.bind(user_id)
.bind(item_form.item)
.bind(item_form.item_url)
.execute(&db_pool)
.await
.unwrap();
let redirect_string = format!("/userwishlist/{user_id}");
Redirect::to(&redirect_string).into_response()
} else {
Redirect::to("/").into_response()
}
}

2
backend/src/user.rs
View File

@ -5,7 +5,7 @@ use axum::{
Extension,
};
use chrono::Utc;
use reqwest::redirect;
///User related structs and functions
use serde::{Deserialize, Serialize};
use sqlx::{prelude::FromRow, SqlitePool};

188
backend/src/wishlist.rs Normal file
View File

@ -0,0 +1,188 @@
use askama_axum::{IntoResponse, Response, Template};
use axum::{extract::{Path, State}, response::Redirect, Extension, Form};
use axum_extra::response::Html;
use chrono::Utc;
use http::StatusCode;
use serde::Deserialize;
use sqlx::SqlitePool;
use crate::{middlewares::is_authorized, user::{get_user_wishlist_items, UserData}};
struct HtmlTemplate<T>(T);
impl<T> IntoResponse for HtmlTemplate<T>
where
T: Template,
{
fn into_response(self) -> Response {
match self.0.render() {
Ok(html) => Html(html).into_response(),
Err(err) => (
StatusCode::INTERNAL_SERVER_ERROR,
format!("Failed to render template. Error: {}", err),
)
.into_response(),
}
}
}
#[derive(Template)]
#[template(path = "userwishlists.html")]
struct WishListsTemplate {
logged_in: bool,
name: String,
users: Vec<UserData>,
}
pub async fn wishlists(
Extension(user_data): Extension<Option<UserData>>,
State(db_pool): State<SqlitePool>,
) -> impl IntoResponse {
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_name.is_some();
let name = user_name.unwrap_or_default();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool)
.await
.unwrap();
if is_authorized("/userwishlists", user_data, db_pool).await {
let template = WishListsTemplate {
logged_in,
name,
users,
};
HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
}
#[derive(Template)]
#[template(path = "userwishlist.html")]
struct UserWishListTemplate {
logged_in: bool,
name: String,
my_wishlist: bool,
user: UserData,
user_wishlist_items: Vec<crate::user::UserWishlistItem>,
}
pub async fn user_wishlist(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
// Extract the user's name from the user data.
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user's id from the user data
let user_userid = user_data.as_ref().map(|s| s.id.clone());
let userid = user_userid.unwrap_or_default();
// Extract the user data.
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool)
.await
.unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user wishlist
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Is viewed and viewing user the same (my wishlist)?
let my_wishlist = user_id == userid;
// Create the wishlist template.
let template = UserWishListTemplate {
logged_in,
name,
my_wishlist,
user: user,
user_wishlist_items,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
}
#[derive(Template)]
#[template(path = "userwishlistadd.html")]
struct UserWishListAddTemplate {
logged_in: bool,
name: String,
user: UserData,
user_wishlist_items: Vec<crate::user::UserWishlistItem>,
}
pub async fn user_wishlist_add(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
// Extract the user's name from the user data.
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user data.
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool)
.await
.unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user roles
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Create the wishlist template.
let template = UserWishListAddTemplate {
logged_in,
name,
user: user,
user_wishlist_items,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
}
#[derive(Deserialize, Debug)]
pub struct ItemForm {
item: String,
item_url: String,
}
pub async fn user_wishlist_add_item(
Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
Form(item_form): Form<ItemForm>
) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Insert new item to database
let now = Utc::now().timestamp();
sqlx::query("insert into wishlist_items (created_at, created_by, updated_at, updated_by, user_id, item, item_url) values (?, ?, ?, ?, ?, ?, ?)")
.bind(now)// Created now
.bind(user_data.as_ref().unwrap().id)// Created by current user
.bind(now) // Updated now
.bind(user_data.as_ref().unwrap().id) // Updated by current user
.bind(user_id)
.bind(item_form.item)
.bind(item_form.item_url)
.execute(&db_pool)
.await
.unwrap();
let redirect_string = format!("/userwishlist/{user_id}");
Redirect::to(&redirect_string).into_response()
} else {
Redirect::to("/").into_response()
}
}

12
backend/templates/userwishlist.html
View File

@ -1,20 +1,32 @@
{% extends "authorized.html" %}
{% block title %}User Profile{% endblock %}
{% block center %}
{% if my_wishlist %}
<h1>My Wishlist</h1>
{% else %}
<h1>{{ user.given_name }} Wishlist</h1>
{% endif %}
<br/>
<h2>List</h2>
{% if my_wishlist %}
<a href="/userwishlist/add/{{ user.id }}">Add</a>
{% endif %}
<table class="table table-striped table-bordered">
<thead>
<tr>
<th scope="col">Item</th>
<th scope="col">Action</th>
</tr>
</thead>
<tbody>
{% for user_wishlist_item in user_wishlist_items %}
<tr>
<td><a href="{{ user_wishlist_item.item_url }}">{{ user_wishlist_item.item }}</a></td>
{% if my_wishlist %}
<td><a href="/userwishlist/received/{{ user_wishlist_item.id }}">Received</a></td>
{% else %}
<td><a href="/userwishlist/bought/{{ user_wishlist_item.id }}">Bought</a></td>
{% endif %}
</tr>
{% endfor %}
</tbody>