Merge backend/micro-services-restructuring into main #69

Open
kscheidecker wants to merge 34 commits from backend/micro-services-restructuring into main
2 changed files with 4 additions and 11 deletions
Showing only changes of commit a9641f4a1c - Show all commits

View File

@@ -4,7 +4,7 @@ from typing import Literal
from datetime import datetime, timedelta from datetime import datetime, timedelta
import requests import requests
from pydantic import BaseModel, Field, field_validator, model_post_init from pydantic import BaseModel, Field
from fastapi.responses import RedirectResponse from fastapi.responses import RedirectResponse
from ..supabase.supabase import SupabaseClient from ..supabase.supabase import SupabaseClient
@@ -46,7 +46,7 @@ class OrderRequest(BaseModel):
supabase_client: SupabaseClient supabase_client: SupabaseClient
@field_validator('basket') # @field_validator('basket')
def validate_basket(cls, v): def validate_basket(cls, v):
"""Validates the basket items. """Validates the basket items.
@@ -84,11 +84,6 @@ class OrderRequest(BaseModel):
self.total_credits += item.unit_credits * basket_item.quantity # increment credit balance self.total_credits += item.unit_credits * basket_item.quantity # increment credit balance
@model_post_init
def auto_load_items(self, _):
self.load_items_and_price()
def to_paypal_items(self): def to_paypal_items(self):
""" """
Converts items to the PayPal API item format. Converts items to the PayPal API item format.

View File

@@ -1,11 +1,9 @@
import os
import logging import logging
import yaml
from fastapi import HTTPException, status from fastapi import HTTPException, status
from supabase import create_client, Client, ClientOptions from supabase import create_client, Client, ClientOptions
from ..structs.shop import Item, BasketItem from ..structs.shop import Item
from ..constants import PARAMETERS_DIR
from ..configuration.environment import Environment from ..configuration.environment import Environment
# Silence the supabase logger # Silence the supabase logger