fix: conflicts and upgrades

apps/api/src/db/payments/payments_courses.py

@@ -1,5 +1,4 @@
-from enum import Enum
-from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey, String, JSON
+from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey
 from typing import Optional
 from datetime import datetime
 

apps/api/src/db/payments/payments_products.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey, String, JSON
+from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey, String
 from typing import Optional
 from datetime import datetime
 

apps/api/src/db/payments/payments_users.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey, String, JSON
+from sqlmodel import SQLModel, Field, Column, BigInteger, ForeignKey
 from typing import Optional
 from datetime import datetime
 

apps/api/src/routers/ee/payments.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, Request
 from sqlmodel import Session
 from src.core.events.database import get_db_session
-from src.db.payments.payments import PaymentsConfig, PaymentsConfigBase, PaymentsConfigCreate, PaymentsConfigRead, PaymentsConfigUpdate
+from src.db.payments.payments import PaymentsConfig, PaymentsConfigCreate, PaymentsConfigRead, PaymentsConfigUpdate
 from src.db.users import PublicUser
 from src.security.auth import get_current_user
 from src.services.payments.payments import (
@@ -10,7 +10,7 @@ from src.services.payments.payments import (
     update_payments_config,
     delete_payments_config,
 )
-from src.db.payments.payments_products import PaymentsProduct, PaymentsProductCreate, PaymentsProductRead, PaymentsProductUpdate
+from src.db.payments.payments_products import PaymentsProductCreate, PaymentsProductRead, PaymentsProductUpdate
 from src.services.payments.payments_products import create_payments_product, delete_payments_product, get_payments_product, list_payments_products, update_payments_product
 
 

apps/api/src/services/payments/payments.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from fastapi import HTTPException, Request
 from sqlmodel import Session, select
 from src.db.payments.payments import (

apps/api/src/services/payments/payments_products.py

@@ -11,7 +11,6 @@ from src.db.users import PublicUser, AnonymousUser
 from src.db.organizations import Organization
 from src.services.orgs.orgs import rbac_check
 from datetime import datetime
-from uuid import uuid4
 
 from src.services.payments.stripe import archive_stripe_product, create_stripe_product, update_stripe_product
 

apps/api/src/services/payments/stripe.py

@@ -1,8 +1,7 @@
-from email.policy import default
 from fastapi import HTTPException, Request
 from sqlmodel import Session
 import stripe
-from src.db.payments.payments_products import PaymentProductTypeEnum, PaymentsProduct, PaymentsProductCreate
+from src.db.payments.payments_products import PaymentProductTypeEnum, PaymentsProduct
 from src.db.users import AnonymousUser, PublicUser
 from src.services.payments.payments import get_payments_config