@social-mail/social-mail-web-server 1.7.520 → 1.7.521

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.520",
+  "version": "1.7.521",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/User.ts

@@ -19,6 +19,7 @@ import type AccessToken from "./AccessToken.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import type { HostedZoneUser } from "./HostedZone.js";
 import type { StoreAccount } from "./StoreAccount.js";
+import type UserGroupMembership from "./UserGroupMembership.js";
 
 export class ChangePassword {
 
@@ -130,6 +131,9 @@ export class User {
     })
     public parentID: number;
 
+    @Column({ dataType: "Boolean", default: () => false })
+    public isGroup: boolean;
+
     @JsonProperty({ help: "Save this to change password"})
     public changePassword: ChangePassword;
 
@@ -186,6 +190,8 @@ export class User {
     closedEmails: Email[];
     hostedZones: HostedZoneUser[];
     storeAccount: StoreAccount;
+    groups: UserGroupMembership[];
+    groupMembers: UserGroupMembership[];
 
     // [GraphService.toGraph]() {
     //     return {

package/src/server/model/entities/UserGroupMembership.ts

@@ -0,0 +1,31 @@
+import Column from "@entity-access/entity-access/dist/decorators/Column.js";
+import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { User } from "./User.js";
+
+export default class UserGroupMembership {
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(User, {
+        property: (x) => x.owner,
+        inverseProperty: (x) => x.groups,
+        foreignKeyConstraint: {
+            name: "FC_User_Group_Memberships_Owner_ID",
+            cascade: "delete"
+        }
+    })
+    ownerID: number;
+
+    @Column({ dataType: "BigInt", key: true})
+    @RelateTo(User, {
+        property: (x) => x.group,
+        inverseProperty: (x) => x.groupMembers,
+        foreignKeyConstraint: {
+            name: "FC_User_Group_Memberships_Group_ID",
+            cascade: "delete"
+        }
+    })
+    groupID: number;
+
+    owner: User;
+
+    group: User;
+}

package/src/server/model/events/MailboxEvents.ts

@@ -106,7 +106,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         const { userID } = this.sessionUser;
         return query.where({ userID }, (p) => (x) =>
             x.userMailboxes.some((um) => um.userID === p.userID)
-            || x.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true));
+            || x.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
     }
 
     modify(query: IEntityQuery<Mailbox>): IEntityQuery<Mailbox> {
@@ -274,18 +274,25 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         // }
 
         await db.fileContents.asQuery()
-            .where(entity, (p) => (x) => x.appFiles.some((a) => a.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID)))
+            .where(entity, (p) => (x) => x.appFiles.some((a) =>
+                a.email.threadContacts.some((m) => m.mailboxID === p.mailboxID)
+                || a.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID)
+            ))
             .update(void 0, (p) => (x) => ({
                 deleted: true
             }));
 
 
         await db.appFiles.asQuery()
-            .delete(entity, (p) => (x) => x.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID));
+            .delete(entity, (p) => (x) => x.email.threadContacts.some((m) => m.mailboxID === p.mailboxID)
+                || x.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID));
 
 
         await db.emails.asQuery()
-            .delete(entity, (p) => (x) => x.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID));
+            .delete(entity, (p) => (x) =>
+                x.threadContacts.some((m) => m.mailboxID === p.mailboxID)
+                || x.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID)
+        );
 
         await db.mailboxContactEmails.asQuery()
             .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);