Merge pull request #305 from learnhouse/feat/get-orgs-with-config

feat: get config with orgs

apps/api/migrations/orgconfigs/v1_1.py

@@ -0,0 +1,14 @@
+def migrate_to_v1_1(v1_config):
+    # Start by copying the existing configuration
+    v1_1_config = v1_config.copy()
+    
+    # Update the config version
+    v1_1_config["config_version"] = "1.1"
+    
+    # Add the new 'cloud' object at the end
+    v1_1_config['cloud'] = {
+        "plan": "free",
+        "custom_domain": False
+    }
+    
+    return v1_1_config

apps/api/src/db/organization_config.py

@@ -83,12 +83,18 @@ class OrgGeneralConfig(BaseModel):
     color: str = "normal"
     watermark: bool = True
 
+# Cloud
+class OrgCloudConfig(BaseModel):
+    plan: Literal["free", "standard", "pro"] = "free"
+    custom_domain: bool = False
+
 
 # Main Config
 class OrganizationConfigBase(BaseModel):
-    config_version: str = "1.0"
+    config_version: str = "1.1"
     general: OrgGeneralConfig
     features: OrgFeatureConfig
+    cloud: OrgCloudConfig
 
 
 class OrganizationConfig(SQLModel, table=True):

apps/api/src/db/organizations.py

@@ -20,6 +20,10 @@ class Organization(OrganizationBase, table=True):
     creation_date: str = ""
     update_date: str = ""
 
+class OrganizationWithConfig(BaseModel):
+    org: Organization
+    config: OrganizationConfig
+
 
 class OrganizationUpdate(OrganizationBase):
     pass

apps/api/src/routers/dev.py

@@ -2,6 +2,7 @@ from fastapi import APIRouter, Depends
 from sqlmodel import Session, select
 from config.config import get_learnhouse_config
 from migrations.orgconfigs.v0tov1 import migrate_v0_to_v1
+from migrations.orgconfigs.v1_1 import migrate_to_v1_1
 from src.core.events.database import get_db_session
 from src.db.organization_config import OrganizationConfig
 
@@ -32,3 +33,22 @@ async def migrate(
         db_session.commit()
 
     return {"message": "Migration successful"}
+
+
+@router.post("/migrate_orgconfig_v1_to_v1.1")
+async def migratev1_1(
+    db_session: Session = Depends(get_db_session),
+):
+    """
+    Migrate organization config from v0 to v1
+    """
+    statement = select(OrganizationConfig)
+    result = db_session.exec(statement)
+
+    for orgConfig in result:
+        orgConfig.config = migrate_to_v1_1(orgConfig.config)
+
+        db_session.add(orgConfig)
+        db_session.commit()
+
+    return {"message": "Migration successful"}

apps/api/src/routers/orgs.py

@@ -20,7 +20,6 @@ from src.services.orgs.users import (
 from src.db.organization_config import OrganizationConfigBase
 from src.db.users import PublicUser
 from src.db.organizations import (
-    Organization,
     OrganizationCreate,
     OrganizationRead,
     OrganizationUpdate,
@@ -321,7 +320,7 @@ async def api_user_orgs(
     limit: int,
     current_user: PublicUser = Depends(get_current_user),
     db_session: Session = Depends(get_db_session),
-) -> List[Organization]:
+) -> List[OrganizationRead]:
     """
     Get orgs by page and limit by current user
     """

apps/api/src/services/install/install.py

@@ -14,6 +14,7 @@ from src.db.organization_config import (
     CourseOrgConfig,
     DiscussionOrgConfig,
     MemberOrgConfig,
+    OrgCloudConfig,
     OrgFeatureConfig,
     OrgGeneralConfig,
     OrganizationConfig,
@@ -350,6 +351,10 @@ def install_create_organization(org_object: OrganizationCreate, db_session: Sess
             collaboration=CollaborationOrgConfig(enabled=True, limit=0),
             api=APIOrgConfig(enabled=True, limit=0),
         ),
+        cloud=OrgCloudConfig(
+            plan='free',
+            custom_domain=False
+        )
     )
 
     org_config = json.loads(org_config.json())

apps/api/src/services/orgs/orgs.py

@@ -13,6 +13,7 @@ from src.db.organization_config import (
     CourseOrgConfig,
     DiscussionOrgConfig,
     MemberOrgConfig,
+    OrgCloudConfig,
     OrgFeatureConfig,
     OrgGeneralConfig,
     OrganizationConfig,
@@ -178,6 +179,10 @@ async def create_org(
             collaboration=CollaborationOrgConfig(enabled=True, limit=0),
             api=APIOrgConfig(enabled=True, limit=0),
         ),
+        cloud=OrgCloudConfig(
+            plan='free',
+            custom_domain=False
+        )
     )
 
     org_config = json.loads(org_config.json())
@@ -209,6 +214,7 @@ async def create_org(
 
     return org
 
+
 async def create_org_with_config(
     request: Request,
     org_object: OrganizationCreate,
@@ -338,6 +344,7 @@ async def update_org(
 
     return org
 
+
 async def update_org_with_config_no_auth(
     request: Request,
     orgconfig: OrganizationConfigBase,
@@ -462,20 +469,43 @@ async def get_orgs_by_user(
     user_id: str,
     page: int = 1,
     limit: int = 10,
-) -> list[Organization]:
+) -> list[OrganizationRead]:
+
     statement = (
         select(Organization)
         .join(UserOrganization)
         .where(
-            Organization.id == UserOrganization.org_id,
             UserOrganization.user_id == user_id,
+            UserOrganization.role_id == 1,  # Only where the user is admin
         )
+        .offset((page - 1) * limit)
+        .limit(limit)
+    )
+
+    # Get organizations where the user is an admin
+    result = db_session.exec(statement)
+    orgs = result.all()
+
+    orgsWithConfig = []
+
+    for org in orgs:
+
+        # Get org config
+        statement = select(OrganizationConfig).where(
+            OrganizationConfig.org_id == org.id
         )
         result = db_session.exec(statement)
 
-    orgs = result.all()
+        org_config = result.first()
+
+        config = OrganizationConfig.model_validate(org_config) if org_config else {}
+
+        org = OrganizationRead(**org.model_dump(), config=config)
+
+        orgsWithConfig.append(org)
+
+    return orgsWithConfig
 
-    return orgs #type:ignore
 
 # Config related
 async def update_org_signup_mechanism(