clean up and remove organization invitations

Author: jp-agenta

api/ee/databases/postgres/migrations/core/versions/59b85eb7516c_add_sso_oidc_tables.py

@@ -302,95 +302,7 @@ def upgrade() -> None:
         ),
     )
 
-    # 4. organization_invitations table
-    op.create_table(
-        "organization_invitations",
-        sa.Column(
-            "id",
-            sa.UUID(),
-            nullable=False,
-        ),
-        sa.Column(
-            "organization_id",
-            sa.UUID(),
-            nullable=False,
-        ),
-        sa.Column(
-            "email",
-            sa.String(),
-            nullable=False,
-        ),
-        sa.Column(
-            "role",
-            sa.String(),
-            nullable=False,
-        ),
-        sa.Column(
-            "token",
-            sa.String(),
-            nullable=False,
-        ),
-        sa.Column(
-            "status",
-            sa.String(),
-            nullable=False,
-            server_default="pending",
-        ),
-        sa.Column(
-            "expires_at",
-            sa.TIMESTAMP(timezone=True),
-            nullable=True,
-        ),
-        sa.Column(
-            "created_at",
-            sa.TIMESTAMP(timezone=True),
-            server_default=sa.text("CURRENT_TIMESTAMP"),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            sa.TIMESTAMP(timezone=True),
-            nullable=True,
-        ),
-        sa.Column(
-            "deleted_at",
-            sa.TIMESTAMP(timezone=True),
-            nullable=True,
-        ),
-        sa.Column(
-            "created_by_id",
-            sa.UUID(),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_by_id",
-            sa.UUID(),
-            nullable=True,
-        ),
-        sa.Column(
-            "deleted_by_id",
-            sa.UUID(),
-            nullable=True,
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.ForeignKeyConstraint(
-            ["organization_id"],
-            ["organizations.id"],
-            ondelete="CASCADE",
-        ),
-        sa.UniqueConstraint(
-            "token",
-            name="uq_organization_invitations_token",
-        ),
-        sa.Index(
-            "ix_organization_invitations_org_email_status",
-            "organization_id",
-            "email",
-            "status",
-        ),
-    )
-
-    # 5. Add is_active to users table
+    # 4. Add is_active to users table
     op.add_column(
         "users",
         sa.Column(
@@ -406,12 +318,6 @@ def downgrade() -> None:
     # Drop in reverse order
     op.drop_column("users", "is_active")
 
-    op.drop_index(
-        "ix_organization_invitations_org_email_status",
-        table_name="organization_invitations",
-    )
-    op.drop_table("organization_invitations")
-
     op.drop_index(
         "ix_organization_providers_flags",
         table_name="organization_providers",

api/ee/src/apis/fastapi/billing/router.py

@@ -263,7 +263,7 @@ async def handle_events(
         organization_id = metadata.get("organization_id")
 
         log.info(
-            "Stripe event:  %s | %s | %s",
+            "[billing] [stripe]   %s | %s | %s",
             organization_id,
             stripe_event.type,
             target,

api/ee/src/core/subscriptions/service.py

@@ -198,7 +198,7 @@ async def process_event(
         **kwargs,
     ) -> SubscriptionDTO:
         log.info(
-            "Billing event: %s | %s | %s",
+            "[billing] [internal] %s | %s | %s",
             organization_id,
             event,
             plan,

api/ee/src/dbs/postgres/organizations/dbes.py

@@ -8,7 +8,6 @@
 from ee.src.dbs.postgres.organizations.dbas import (
     OrganizationDomainDBA,
     OrganizationProviderDBA,
-    OrganizationInvitationDBA,
 )
 
 
@@ -61,25 +60,3 @@ class OrganizationProviderDBE(Base, OrganizationProviderDBA):
             postgresql_using="gin",
         ),
     )
-
-
-class OrganizationInvitationDBE(Base, OrganizationInvitationDBA):
-    __tablename__ = "organization_invitations"
-
-    __table_args__ = (
-        ForeignKeyConstraint(
-            ["organization_id"],
-            ["organizations.id"],
-            ondelete="CASCADE",
-        ),
-        UniqueConstraint(
-            "token",
-            name="uq_organization_invitations_token",
-        ),
-        Index(
-            "ix_organization_invitations_org_email_status",
-            "organization_id",
-            "email",
-            "status",
-        ),
-    )

api/ee/src/services/commoners.py

@@ -20,7 +20,11 @@
     user_exists,
 )
 from ee.src.models.api.organization_models import CreateOrganization
-from oss.src.services.user_service import create_new_user, check_user_exists, delete_user
+from oss.src.services.user_service import (
+    create_new_user,
+    check_user_exists,
+    delete_user,
+)
 from oss.src.models.db_models import UserDB, OrganizationDB
 from ee.src.services.email_helper import (
     add_contact_to_loops,
@@ -135,8 +139,6 @@ async def create_accounts(
 
     user = await db_manager.get_user_with_email(email=user_dict["email"])
     if user is None:
-        log.info("[scopes] Yey! A new user is signing up!")
-
         # Check if user exists before attempting creation
         user_existed_before = await check_user_exists(user_dict["email"])
 

api/ee/src/services/db_manager_ee.py

@@ -1323,22 +1323,6 @@ async def get_workspace_details(workspace: WorkspaceDB) -> WorkspaceResponse:
         raise e
 
 
-async def get_organization_invitations(organization_id: str):
-    """
-    Gets the organization invitations.
-
-    Args:
-        organization_id (str): The ID of the organization
-    """
-
-    async with engine.core_session() as session:
-        result = await session.execute(
-            select(InvitationDB).filter_by(organization_id=organization_id)
-        )
-        invitations = result.scalars().all()
-        return invitations
-
-
 async def get_project_invitations(project_id: str, **kwargs):
     """
     Gets the project invitations.

api/oss/src/dbs/postgres/organizations/dbes.py

@@ -8,7 +8,6 @@
 from oss.src.dbs.postgres.organizations.dbas import (
     OrganizationDomainDBA,
     OrganizationProviderDBA,
-    OrganizationInvitationDBA,
 )
 
 
@@ -61,25 +60,3 @@ class OrganizationProviderDBE(Base, OrganizationProviderDBA):
             postgresql_using="gin",
         ),
     )
-
-
-class OrganizationInvitationDBE(Base, OrganizationInvitationDBA):
-    __tablename__ = "organization_invitations"
-
-    __table_args__ = (
-        ForeignKeyConstraint(
-            ["organization_id"],
-            ["organizations.id"],
-            ondelete="CASCADE",
-        ),
-        UniqueConstraint(
-            "token",
-            name="uq_organization_invitations_token",
-        ),
-        Index(
-            "ix_organization_invitations_org_email_status",
-            "organization_id",
-            "email",
-            "status",
-        ),
-    )