merch backend #10

Manually merged
cnidariaware merged 0 commits from merch into dev 2025-11-24 11:36:07 -07:00
Owner

Do OpenAPI/swagger docs

Do OpenAPI/swagger docs
feat(checkout): singular item working and written into the cell
All checks were successful
Doc Tests / deploy (push) Successful in 1m23s
fec91827e1
fix(actions): removed out the compiling step from the test output
All checks were successful
Doc Tests / deploy (push) Successful in 1m21s
128350b327
feat(actions): added check step
All checks were successful
Doc Tests / deploy (push) Successful in 1m55s
a0841f29fd
Done to prevent a useless download if error already present
feat(merch): accepting json by url path (#1)
All checks were successful
Doc Tests / deploy (push) Successful in 2m18s
584f9f4ea0
feat(recieve orders): wrties customer info to excel sheet (#1)
All checks were successful
Doc Tests / deploy (push) Successful in 2m24s
3df1ca9b68
nit(xl_init)!: intial thought process
Some checks failed
Doc Tests / deploy (push) Failing after 59s
a2bdec0ef6
feat(merch): now can recieve orders, can create xl sheet if does not exist (#1)
All checks were successful
Doc Tests / deploy (push) Successful in 2m58s
6329a1a834
feat(database connector): changed to use struct instead (#6)
Some checks failed
Doc Tests / deploy (push) Failing after 1m19s
45534ee0d8
feat(merch): switched over to Arc Strings (#1)
All checks were successful
Doc Tests / deploy (push) Successful in 2m54s
All Tests / deploy (pull_request) Successful in 2m21s
Build Container & Upload / deploy (pull_request) Successful in 4m15s
Doc Tests / deploy (pull_request) Successful in 2m12s
1ac9c6a19a
cnidariaware changed title from merch to WIP: merch 2025-11-17 12:32:51 -07:00
cnidariaware changed title from WIP: merch to WIP: merch backend 2025-11-17 12:33:10 -07:00
cnidariaware added the due date 2025-11-29 2025-11-17 12:33:29 -07:00
src/main.rs Outdated
@ -6,3 +10,4 @@
use utoipa_swagger_ui::SwaggerUi;
#[actix_web::main]
async fn main() -> std::io::Result<()> {
Author
Owner

Differentiate if not in docker container

Differentiate if not in docker container
cnidariaware marked this conversation as resolved
cnidariaware left a comment

Add the notes to the appropriate files

Add the notes to the appropriate files
@ -1,13 +1,20 @@
use actix_cors::Cors;
use actix_web::{App, HttpServer, web};
use tokio::sync::Mutex;
Author
Owner

Check if actixs has their own mutex

Check if actixs has their own mutex
Author
Owner

no built in version into actixs web

we are using tokio for the .await on the mutex

no built in version into actixs web we are using tokio for the .await on the mutex
cnidariaware marked this conversation as resolved
src/main.rs Outdated
@ -20,3 +27,3 @@
//.supports_credentials()
)
.service(hello)
.app_data(database.clone())
Author
Owner

why are you cloning here that is a mistake

why are you cloning here that is a mistake
Author
Owner

that may be needed for ownership rules, if it is a Arc then a hard ref is needed here

that may be needed for ownership rules, if it is a Arc then a hard ref is needed here
Author
Owner

actix_web::web::Data is a wrapper around Arc, therefore the clone is a O(1) an increase the amount of references it has (its minimal performance loss)

actix_web::web::Data is a wrapper around Arc, therefore the clone is a O(1) an increase the amount of references it has (its minimal performance loss)
cnidariaware marked this conversation as resolved
@ -2,2 +6,4 @@
use darkicewolf50_actix_setup::log_incoming;
use serde::{Deserialize, Serialize};
use serde_json::json;
use tokio::sync::Mutex;
Author
Owner

again check if actixs has a mutex type

again check if actixs has a mutex type
Author
Owner

see previous comment about this

see previous comment about this
cnidariaware marked this conversation as resolved
@ -30,0 +181,4 @@
.set_value(customer_info.shipping_details.clone());
writer::xlsx::write(&book, self.connection.as_ref().unwrap().as_path()).unwrap();
}
Author
Owner

change to spread out shipping details in excel sheet

change to spread out shipping details in excel sheet
Author
Owner

add comment like above for the section of what it is doing

add comment like above for the section of what it is doing
Author
Owner

Shipping detail rework to spread out

Shipping detail rework to spread out
cnidariaware marked this conversation as resolved
Author
Owner

commented here write out

commented here write out
cnidariaware marked this conversation as resolved
Author
Owner

missing log output

missing log output
Author
Owner

its there just not in the preview

its there just not in the preview
cnidariaware marked this conversation as resolved
Author
Owner

Remove pull request from build & upload from pull request

Remove duplicate tests for all tests and doc tests

Remove pull request from build & upload from pull request Remove duplicate tests for all tests and doc tests
feat(merch): started on PR comments and changed to use x-forwarded-for logging
All checks were successful
Doc Tests / deploy (push) Successful in 2m47s
All Tests / deploy (pull_request) Successful in 2m45s
Build Container & Upload / deploy (pull_request) Successful in 4m34s
Doc Tests / deploy (pull_request) Successful in 2m41s
a3dc02dee6
cnidariaware force-pushed merch from a3dc02dee6
All checks were successful
Doc Tests / deploy (push) Successful in 2m47s
All Tests / deploy (pull_request) Successful in 2m45s
Build Container & Upload / deploy (pull_request) Successful in 4m34s
Doc Tests / deploy (pull_request) Successful in 2m41s
to e356e90a02
All checks were successful
Doc Tests / deploy (push) Successful in 2m47s
All Tests / deploy (pull_request) Successful in 2m41s
Build Container & Upload / deploy (pull_request) Successful in 4m32s
Doc Tests / deploy (pull_request) Successful in 2m39s
2025-11-17 18:48:14 -07:00
Compare
Author
Owner

Update actions to build with rust-alpine version instead of Ubuntu

Update actions to build with rust-alpine version instead of Ubuntu
Author
Owner

Make UUID optional, then give a UUID if None to each order

Make UUID optional, then give a UUID if None to each order
Author
Owner

OpenAPI docs will be completed with ucalgary-baja/ucalg-baja-cloud#8 as we don't have time now

OpenAPI docs will be completed with ucalgary-baja/ucalg-baja-cloud#8 as we don't have time now
cnidariaware left a comment

Change to include comment fixes

Change to include comment fixes
@ -14,1 +13,3 @@
sub_team: String,
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CustomerInfo {
order_id: Option<ArcString>,
Author
Owner

When enum is none it should be given a uuid

When enum is none it should be given a uuid
cnidariaware marked this conversation as resolved
@ -30,0 +33,4 @@
}
#[get("/recieve_order/{order_request}")]
pub async fn recieve_order(order_request: web::Json<OrderRequest>) -> impl Responder {
Author
Owner

make items in this pub so that the order uuid can be edited to include a uuid when enum is None

make items in this pub so that the order uuid can be edited to include a uuid when enum is None
cnidariaware marked this conversation as resolved
feat(merch): expanded shipping details, made None type not possible
All checks were successful
Doc Tests / deploy (push) Successful in 2m47s
All Tests / deploy (pull_request) Successful in 2m41s
Doc Tests / deploy (pull_request) Successful in 2m36s
9e94d276ef
cnidariaware changed target branch from master to dev 2025-11-20 21:29:18 -07:00
feat(shipping expansion): changed over to clearly display all of shipping more spread out
All checks were successful
Doc Tests / deploy (push) Successful in 2m49s
All Tests / deploy (pull_request) Successful in 2m41s
Doc Tests / deploy (pull_request) Successful in 2m46s
e2b116a024
feat(chechout): total is now calculated rather than trusting api
All checks were successful
Doc Tests / deploy (push) Successful in 2m38s
All Tests / deploy (pull_request) Successful in 2m43s
Doc Tests / deploy (pull_request) Successful in 2m45s
78b6bffbd6
feat(checkout): coupon place now in sheet
All checks were successful
Doc Tests / deploy (push) Successful in 2m38s
All Tests / deploy (pull_request) Successful in 2m45s
Doc Tests / deploy (pull_request) Successful in 2m44s
c472cf82a8
fix(database): stopped recursion when creating new spreadsheet
All checks were successful
Doc Tests / deploy (push) Successful in 2m48s
All Tests / deploy (pull_request) Successful in 2m48s
Doc Tests / deploy (pull_request) Successful in 2m38s
094555c8c2
cnidariaware changed title from WIP: merch backend to merch backend 2025-11-22 13:46:38 -07:00
siddharth24 left a comment

GG

GG
Author
Owner

Merged into dev

Merged into dev
Author
Owner

Merged into dev

Merged into dev
cnidariaware closed this pull request 2025-11-22 14:16:58 -07:00
cnidariaware reopened this pull request 2025-11-24 11:36:06 -07:00
cnidariaware manually merged commit 39c99ea688 into dev 2025-11-24 11:36:07 -07:00
Sign in to join this conversation.
No reviewers
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

2025-11-29

Depends on
#1 Merch Shop Backend
ucalgary-baja/ucalg-baja-cloud
Reference
ucalgary-baja/ucalg-baja-cloud!10
No description provided.