@sudobility/entity_service 1.0.4 → 1.0.6

package/dist/helpers/EntityHelper.cjs

@@ -18,8 +18,10 @@ class EntityHelper {
     /**
      * Create a personal entity for a user.
      * Called automatically when a user first logs in.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    async createPersonalEntity(userId, email) {
+    async createPersonalEntity(firebaseUid, email) {
         const slug = (0, utils_1.generateEntitySlug)();
         const displayName = email?.split('@')[0] ?? 'Personal';
         const [entity] = await this.config.db
@@ -28,37 +30,42 @@ class EntityHelper {
             entity_slug: slug,
             entity_type: types_1.EntityType.PERSONAL,
             display_name: displayName,
-            owner_user_id: userId,
         })
             .returning();
-        // Add user as admin member
+        // Add user as admin (personal entities use admin role, not owner)
         await this.config.db.insert(this.config.membersTable).values({
             entity_id: entity.id,
-            user_id: userId,
+            user_id: firebaseUid,
             role: types_1.EntityRole.ADMIN,
+            is_active: true,
         });
         return this.mapRecordToEntity(entity);
     }
     /**
      * Get or create a personal entity for a user.
      * Ensures exactly one personal entity exists per user.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    async getOrCreatePersonalEntity(userId, email) {
-        // Check for existing personal entity
+    async getOrCreatePersonalEntity(firebaseUid, email) {
+        // Check for existing personal entity where user is admin
         const existing = await this.config.db
-            .select()
-            .from(this.config.entitiesTable)
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.entitiesTable.owner_user_id, userId), (0, drizzle_orm_1.eq)(this.config.entitiesTable.entity_type, types_1.EntityType.PERSONAL)))
+            .select({ entity: this.config.entitiesTable })
+            .from(this.config.membersTable)
+            .innerJoin(this.config.entitiesTable, (0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, this.config.entitiesTable.id))
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, firebaseUid), (0, drizzle_orm_1.eq)(this.config.membersTable.role, types_1.EntityRole.ADMIN), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true), (0, drizzle_orm_1.eq)(this.config.entitiesTable.entity_type, types_1.EntityType.PERSONAL)))
             .limit(1);
         if (existing.length > 0) {
-            return this.mapRecordToEntity(existing[0]);
+            return this.mapRecordToEntity(existing[0].entity);
         }
-        return this.createPersonalEntity(userId, email);
+        return this.createPersonalEntity(firebaseUid, email);
     }
     /**
      * Create an organization entity.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param request - Entity creation request
      */
-    async createOrganizationEntity(userId, request) {
+    async createOrganizationEntity(firebaseUid, request) {
         // Determine slug
         let slug;
         if (request.entitySlug) {
@@ -81,14 +88,14 @@ class EntityHelper {
             entity_type: types_1.EntityType.ORGANIZATION,
             display_name: request.displayName,
             description: request.description ?? null,
-            owner_user_id: userId,
         })
             .returning();
-        // Add creator as admin member
+        // Add creator as owner
         await this.config.db.insert(this.config.membersTable).values({
             entity_id: entity.id,
-            user_id: userId,
-            role: types_1.EntityRole.ADMIN,
+            user_id: firebaseUid,
+            role: types_1.EntityRole.OWNER,
+            is_active: true,
         });
         return this.mapRecordToEntity(entity);
     }
@@ -123,8 +130,10 @@ class EntityHelper {
     /**
      * Get all entities a user is a member of.
      * If the user has no entities, a personal entity is automatically created.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name if creating personal entity
      */
-    async getUserEntities(userId) {
+    async getUserEntities(firebaseUid, email) {
         const results = await this.config.db
             .select({
             entity: this.config.entitiesTable,
@@ -132,14 +141,14 @@ class EntityHelper {
         })
             .from(this.config.membersTable)
             .innerJoin(this.config.entitiesTable, (0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, this.config.entitiesTable.id))
-            .where((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId));
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, firebaseUid), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true)));
         // If user has no entities, create a personal entity for them
         if (results.length === 0) {
-            const personalEntity = await this.createPersonalEntity(userId);
+            const personalEntity = await this.createPersonalEntity(firebaseUid, email);
             return [
                 {
                     ...personalEntity,
-                    userRole: types_1.EntityRole.ADMIN,
+                    userRole: types_1.EntityRole.OWNER,
                 },
             ];
         }
@@ -235,7 +244,6 @@ class EntityHelper {
             displayName: record.display_name,
             description: record.description,
             avatarUrl: record.avatar_url,
-            ownerUserId: record.owner_user_id,
             createdAt: record.created_at?.toISOString() ?? new Date().toISOString(),
             updatedAt: record.updated_at?.toISOString() ?? new Date().toISOString(),
         };

package/dist/helpers/EntityHelper.d.ts

@@ -12,17 +12,23 @@ export declare class EntityHelper {
     /**
      * Create a personal entity for a user.
      * Called automatically when a user first logs in.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    createPersonalEntity(userId: string, email?: string): Promise<Entity>;
+    createPersonalEntity(firebaseUid: string, email?: string): Promise<Entity>;
     /**
      * Get or create a personal entity for a user.
      * Ensures exactly one personal entity exists per user.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    getOrCreatePersonalEntity(userId: string, email?: string): Promise<Entity>;
+    getOrCreatePersonalEntity(firebaseUid: string, email?: string): Promise<Entity>;
     /**
      * Create an organization entity.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param request - Entity creation request
      */
-    createOrganizationEntity(userId: string, request: CreateEntityRequest): Promise<Entity>;
+    createOrganizationEntity(firebaseUid: string, request: CreateEntityRequest): Promise<Entity>;
     /**
      * Get entity by ID.
      */
@@ -34,8 +40,10 @@ export declare class EntityHelper {
     /**
      * Get all entities a user is a member of.
      * If the user has no entities, a personal entity is automatically created.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name if creating personal entity
      */
-    getUserEntities(userId: string): Promise<EntityWithRole[]>;
+    getUserEntities(firebaseUid: string, email?: string): Promise<EntityWithRole[]>;
     /**
      * Update entity details.
      */

package/dist/helpers/EntityHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/EntityHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAGlB;;GAEG;AACH,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,kBAAkB;IAEvD;;;OAGG;IACG,oBAAoB,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IAwBlB;;;OAGG;IACG,yBAAyB,CAC7B,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IAoBlB;;OAEG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAqClB;;OAEG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAczD;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAc3D;;;OAGG;IACG,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IA8BhE;;OAEG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAyClB;;;OAGG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAenD;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUrD;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAa1B"}
+{"version":3,"file":"EntityHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/EntityHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAGlB;;GAEG;AACH,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,kBAAkB;IAEvD;;;;;OAKG;IACG,oBAAoB,CACxB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IAwBlB;;;;;OAKG;IACG,yBAAyB,CAC7B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IA0BlB;;;;OAIG;IACG,wBAAwB,CAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAqClB;;OAEG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAczD;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAc3D;;;;;OAKG;IACG,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,EAAE,CAAC;IAmC5B;;OAEG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAyClB;;;OAGG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAenD;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUrD;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAY1B"}

package/dist/helpers/EntityHelper.js

@@ -18,8 +18,10 @@ class EntityHelper {
     /**
      * Create a personal entity for a user.
      * Called automatically when a user first logs in.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    async createPersonalEntity(userId, email) {
+    async createPersonalEntity(firebaseUid, email) {
         const slug = (0, utils_1.generateEntitySlug)();
         const displayName = email?.split('@')[0] ?? 'Personal';
         const [entity] = await this.config.db
@@ -28,37 +30,42 @@ class EntityHelper {
             entity_slug: slug,
             entity_type: types_1.EntityType.PERSONAL,
             display_name: displayName,
-            owner_user_id: userId,
         })
             .returning();
-        // Add user as admin member
+        // Add user as admin (personal entities use admin role, not owner)
         await this.config.db.insert(this.config.membersTable).values({
             entity_id: entity.id,
-            user_id: userId,
+            user_id: firebaseUid,
             role: types_1.EntityRole.ADMIN,
+            is_active: true,
         });
         return this.mapRecordToEntity(entity);
     }
     /**
      * Get or create a personal entity for a user.
      * Ensures exactly one personal entity exists per user.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name
      */
-    async getOrCreatePersonalEntity(userId, email) {
-        // Check for existing personal entity
+    async getOrCreatePersonalEntity(firebaseUid, email) {
+        // Check for existing personal entity where user is admin
         const existing = await this.config.db
-            .select()
-            .from(this.config.entitiesTable)
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.entitiesTable.owner_user_id, userId), (0, drizzle_orm_1.eq)(this.config.entitiesTable.entity_type, types_1.EntityType.PERSONAL)))
+            .select({ entity: this.config.entitiesTable })
+            .from(this.config.membersTable)
+            .innerJoin(this.config.entitiesTable, (0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, this.config.entitiesTable.id))
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, firebaseUid), (0, drizzle_orm_1.eq)(this.config.membersTable.role, types_1.EntityRole.ADMIN), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true), (0, drizzle_orm_1.eq)(this.config.entitiesTable.entity_type, types_1.EntityType.PERSONAL)))
             .limit(1);
         if (existing.length > 0) {
-            return this.mapRecordToEntity(existing[0]);
+            return this.mapRecordToEntity(existing[0].entity);
         }
-        return this.createPersonalEntity(userId, email);
+        return this.createPersonalEntity(firebaseUid, email);
     }
     /**
      * Create an organization entity.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param request - Entity creation request
      */
-    async createOrganizationEntity(userId, request) {
+    async createOrganizationEntity(firebaseUid, request) {
         // Determine slug
         let slug;
         if (request.entitySlug) {
@@ -81,14 +88,14 @@ class EntityHelper {
             entity_type: types_1.EntityType.ORGANIZATION,
             display_name: request.displayName,
             description: request.description ?? null,
-            owner_user_id: userId,
         })
             .returning();
-        // Add creator as admin member
+        // Add creator as owner
         await this.config.db.insert(this.config.membersTable).values({
             entity_id: entity.id,
-            user_id: userId,
-            role: types_1.EntityRole.ADMIN,
+            user_id: firebaseUid,
+            role: types_1.EntityRole.OWNER,
+            is_active: true,
         });
         return this.mapRecordToEntity(entity);
     }
@@ -123,8 +130,10 @@ class EntityHelper {
     /**
      * Get all entities a user is a member of.
      * If the user has no entities, a personal entity is automatically created.
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param email - Optional email for display name if creating personal entity
      */
-    async getUserEntities(userId) {
+    async getUserEntities(firebaseUid, email) {
         const results = await this.config.db
             .select({
             entity: this.config.entitiesTable,
@@ -132,14 +141,14 @@ class EntityHelper {
         })
             .from(this.config.membersTable)
             .innerJoin(this.config.entitiesTable, (0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, this.config.entitiesTable.id))
-            .where((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId));
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.user_id, firebaseUid), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true)));
         // If user has no entities, create a personal entity for them
         if (results.length === 0) {
-            const personalEntity = await this.createPersonalEntity(userId);
+            const personalEntity = await this.createPersonalEntity(firebaseUid, email);
             return [
                 {
                     ...personalEntity,
-                    userRole: types_1.EntityRole.ADMIN,
+                    userRole: types_1.EntityRole.OWNER,
                 },
             ];
         }
@@ -235,7 +244,6 @@ class EntityHelper {
             displayName: record.display_name,
             description: record.description,
             avatarUrl: record.avatar_url,
-            ownerUserId: record.owner_user_id,
             createdAt: record.created_at?.toISOString() ?? new Date().toISOString(),
             updatedAt: record.updated_at?.toISOString() ?? new Date().toISOString(),
         };

package/dist/helpers/EntityHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityHelper.js","sourceRoot":"","sources":["../../src/helpers/EntityHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityHelper.js","sourceRoot":"","sources":["../../src/helpers/EntityHelper.ts"],"names":[],"mappings":"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"}

package/dist/helpers/EntityMemberHelper.cjs

@@ -16,24 +16,28 @@ class EntityMemberHelper {
     }
     /**
      * Get all members of an entity.
+     * By default, only returns active members.
      */
     async getMembers(entityId, options) {
-        // Build conditions
+        // Build conditions - default to active members only
         const conditions = [(0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId)];
         if (options?.role) {
             conditions.push((0, drizzle_orm_1.eq)(this.config.membersTable.role, options.role));
         }
+        // Filter by is_active (default to true if not specified)
+        const isActive = options?.isActive ?? true;
+        conditions.push((0, drizzle_orm_1.eq)(this.config.membersTable.is_active, isActive));
         let query = this.config.db
             .select({
             member: this.config.membersTable,
             user: {
-                id: this.config.usersTable.uuid,
+                id: this.config.usersTable.firebase_uid,
                 email: this.config.usersTable.email,
                 displayName: this.config.usersTable.display_name,
             },
         })
             .from(this.config.membersTable)
-            .leftJoin(this.config.usersTable, (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, this.config.usersTable.uuid))
+            .leftJoin(this.config.usersTable, (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, this.config.usersTable.firebase_uid))
             .where((0, drizzle_orm_1.and)(...conditions))
             .$dynamic();
         if (options?.limit) {
@@ -47,20 +51,28 @@ class EntityMemberHelper {
     }
     /**
      * Get a specific member by user ID.
+     * Only returns active members by default.
      */
-    async getMember(entityId, userId) {
+    async getMember(entityId, userId, includeInactive = false) {
+        const conditions = [
+            (0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId),
+            (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId),
+        ];
+        if (!includeInactive) {
+            conditions.push((0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true));
+        }
         const results = await this.config.db
             .select({
             member: this.config.membersTable,
             user: {
-                id: this.config.usersTable.uuid,
+                id: this.config.usersTable.firebase_uid,
                 email: this.config.usersTable.email,
                 displayName: this.config.usersTable.display_name,
             },
         })
             .from(this.config.membersTable)
-            .leftJoin(this.config.usersTable, (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, this.config.usersTable.uuid))
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId)))
+            .leftJoin(this.config.usersTable, (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, this.config.usersTable.firebase_uid))
+            .where((0, drizzle_orm_1.and)(...conditions))
             .limit(1);
         if (results.length === 0) {
             return null;
@@ -69,12 +81,13 @@ class EntityMemberHelper {
     }
     /**
      * Get user's role in an entity.
+     * Only returns role for active members.
      */
     async getUserRole(entityId, userId) {
         const results = await this.config.db
             .select({ role: this.config.membersTable.role })
             .from(this.config.membersTable)
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId)))
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true)))
             .limit(1);
         if (results.length === 0) {
             return null;
@@ -83,32 +96,61 @@ class EntityMemberHelper {
     }
     /**
      * Add a member to an entity.
+     * @param entityId - The entity ID
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param role - The member's role
      */
-    async addMember(entityId, userId, role) {
-        const [member] = await this.config.db
-            .insert(this.config.membersTable)
-            .values({
-            entity_id: entityId,
-            user_id: userId,
-            role,
-        })
-            .returning();
+    async addMember(entityId, firebaseUid, role) {
+        // Check if there's an existing inactive membership to reactivate
+        const existing = await this.getMember(entityId, firebaseUid, true);
+        let member;
+        if (existing && !existing.isActive) {
+            // Reactivate existing membership
+            const [updated] = await this.config.db
+                .update(this.config.membersTable)
+                .set({
+                role,
+                is_active: true,
+                updated_at: new Date(),
+            })
+                .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, firebaseUid)))
+                .returning();
+            member = updated;
+        }
+        else {
+            // Create new membership
+            const [inserted] = await this.config.db
+                .insert(this.config.membersTable)
+                .values({
+                entity_id: entityId,
+                user_id: firebaseUid,
+                role,
+                is_active: true,
+            })
+                .returning();
+            member = inserted;
+        }
         // Fetch user info for response
         const users = await this.config.db
             .select({
-            id: this.config.usersTable.uuid,
+            id: this.config.usersTable.firebase_uid,
             email: this.config.usersTable.email,
             displayName: this.config.usersTable.display_name,
         })
             .from(this.config.usersTable)
-            .where((0, drizzle_orm_1.eq)(this.config.usersTable.uuid, userId))
+            .where((0, drizzle_orm_1.eq)(this.config.usersTable.firebase_uid, firebaseUid))
             .limit(1);
         return this.mapRecordToMember(member, users[0] ?? null);
     }
     /**
      * Update a member's role.
+     * Cannot change the owner's role. Cannot set anyone to owner (ownership transfer is separate).
      */
     async updateMemberRole(entityId, userId, role) {
+        // Cannot assign owner role via this method
+        if (role === types_1.EntityRole.OWNER) {
+            throw new Error('Cannot assign owner role. Use ownership transfer instead.');
+        }
         // Check constraints for personal entities
         const entity = await this.config.db
             .select()
@@ -118,16 +160,10 @@ class EntityMemberHelper {
         if (entity.length > 0 && entity[0].entity_type === types_1.EntityType.PERSONAL) {
             throw new Error('Cannot change roles in personal entities');
         }
-        // Ensure at least one admin remains
-        if (role !== types_1.EntityRole.ADMIN) {
-            const admins = await this.config.db
-                .select()
-                .from(this.config.membersTable)
-                .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.role, types_1.EntityRole.ADMIN)));
-            const isOnlyAdmin = admins.length === 1 && admins[0].user_id === userId;
-            if (isOnlyAdmin) {
-                throw new Error('Cannot demote the only admin');
-            }
+        // Check if user is the owner - cannot change owner's role
+        const currentMember = await this.getMember(entityId, userId);
+        if (currentMember?.role === types_1.EntityRole.OWNER) {
+            throw new Error('Cannot change the owner\'s role');
         }
         const [updated] = await this.config.db
             .update(this.config.membersTable)
@@ -135,22 +171,26 @@ class EntityMemberHelper {
             role,
             updated_at: new Date(),
         })
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId)))
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId), (0, drizzle_orm_1.eq)(this.config.membersTable.is_active, true)))
             .returning();
+        if (!updated) {
+            throw new Error('Member not found or inactive');
+        }
         // Fetch user info for response
         const users = await this.config.db
             .select({
-            id: this.config.usersTable.uuid,
+            id: this.config.usersTable.firebase_uid,
             email: this.config.usersTable.email,
             displayName: this.config.usersTable.display_name,
         })
             .from(this.config.usersTable)
-            .where((0, drizzle_orm_1.eq)(this.config.usersTable.uuid, userId))
+            .where((0, drizzle_orm_1.eq)(this.config.usersTable.firebase_uid, userId))
             .limit(1);
         return this.mapRecordToMember(updated, users[0] ?? null);
     }
     /**
-     * Remove a member from an entity.
+     * Remove a member from an entity (soft delete).
+     * Sets is_active = false instead of deleting the record.
      */
     async removeMember(entityId, userId) {
         // Check constraints for personal entities
@@ -162,23 +202,21 @@ class EntityMemberHelper {
         if (entity.length > 0 && entity[0].entity_type === types_1.EntityType.PERSONAL) {
             throw new Error('Cannot remove members from personal entities');
         }
-        // Check if user is the owner
-        if (entity.length > 0 && entity[0].owner_user_id === userId) {
-            throw new Error('Cannot remove the entity owner');
-        }
-        // Ensure at least one admin remains
+        // Check if user is the owner - cannot remove owner
         const member = await this.getMember(entityId, userId);
-        if (member?.role === types_1.EntityRole.ADMIN) {
-            const admins = await this.config.db
-                .select()
-                .from(this.config.membersTable)
-                .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.role, types_1.EntityRole.ADMIN)));
-            if (admins.length === 1) {
-                throw new Error('Cannot remove the only admin');
-            }
+        if (!member) {
+            throw new Error('Member not found');
+        }
+        if (member.role === types_1.EntityRole.OWNER) {
+            throw new Error('Cannot remove the entity owner');
         }
+        // Soft delete - set is_active = false
         await this.config.db
-            .delete(this.config.membersTable)
+            .update(this.config.membersTable)
+            .set({
+            is_active: false,
+            updated_at: new Date(),
+        })
             .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(this.config.membersTable.entity_id, entityId), (0, drizzle_orm_1.eq)(this.config.membersTable.user_id, userId)));
     }
     /**
@@ -197,6 +235,7 @@ class EntityMemberHelper {
             entityId: record.entity_id,
             userId: record.user_id,
             role: record.role,
+            isActive: record.is_active ?? true,
             joinedAt: record.joined_at?.toISOString() ?? new Date().toISOString(),
             createdAt: record.created_at?.toISOString() ?? new Date().toISOString(),
             updatedAt: record.updated_at?.toISOString() ?? new Date().toISOString(),

package/dist/helpers/EntityMemberHelper.d.ts

@@ -11,26 +11,34 @@ export declare class EntityMemberHelper {
     constructor(config: EntityHelperConfig);
     /**
      * Get all members of an entity.
+     * By default, only returns active members.
      */
     getMembers(entityId: string, options?: ListMembersOptions): Promise<EntityMember[]>;
     /**
      * Get a specific member by user ID.
+     * Only returns active members by default.
      */
-    getMember(entityId: string, userId: string): Promise<EntityMember | null>;
+    getMember(entityId: string, userId: string, includeInactive?: boolean): Promise<EntityMember | null>;
     /**
      * Get user's role in an entity.
+     * Only returns role for active members.
      */
     getUserRole(entityId: string, userId: string): Promise<EntityRole | null>;
     /**
      * Add a member to an entity.
+     * @param entityId - The entity ID
+     * @param firebaseUid - The Firebase UID (used as user_id)
+     * @param role - The member's role
      */
-    addMember(entityId: string, userId: string, role: EntityRole): Promise<EntityMember>;
+    addMember(entityId: string, firebaseUid: string, role: EntityRole): Promise<EntityMember>;
     /**
      * Update a member's role.
+     * Cannot change the owner's role. Cannot set anyone to owner (ownership transfer is separate).
      */
     updateMemberRole(entityId: string, userId: string, role: EntityRole): Promise<EntityMember>;
     /**
-     * Remove a member from an entity.
+     * Remove a member from an entity (soft delete).
+     * Sets is_active = false instead of deleting the record.
      */
     removeMember(entityId: string, userId: string): Promise<void>;
     /**

package/dist/helpers/EntityMemberHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityMemberHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/EntityMemberHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,UAAU,EAEV,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,kBAAkB;IAEvD;;OAEG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,YAAY,EAAE,CAAC;IAuC1B;;OAEG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IA8B/B;;OAEG;IACG,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAmB7B;;OAEG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,YAAY,CAAC;IAwBxB;;OAEG;IACG,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,YAAY,CAAC;IA2DxB;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CnE;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAwB1B"}
+{"version":3,"file":"EntityMemberHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/EntityMemberHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,UAAU,EAEV,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,kBAAkB;IAEvD;;;OAGG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C1B;;;OAGG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,UAAQ,GACtB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAiC/B;;;OAGG;IACG,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAoB7B;;;;;OAKG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,YAAY,CAAC;IAkDxB;;;OAGG;IACG,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,YAAY,CAAC;IAwDxB;;;OAGG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCnE;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAyB1B"}