fix: Don't show suspended users in document facepile or list of viewers (#3497)

2022-05-15 06:05:40 -07:00
parent bca66f7415
commit 36a3ae4b01
4 changed files with 33 additions and 5 deletions
--- a/server/models/View.ts
+++ b/server/models/View.ts
@@ -57,7 +57,10 @@ class View extends BaseModel {
    return model;
  }

-  static async findByDocument(documentId: string) {
+  static async findByDocument(
+    documentId: string,
+    { includeSuspended }: { includeSuspended?: boolean }
+  ) {
    return this.findAll({
      where: {
        documentId,
@@ -67,6 +70,10 @@ class View extends BaseModel {
        {
          model: User,
          paranoid: false,
+          required: true,
+          ...(includeSuspended
+            ? {}
+            : { where: { suspendedAt: { [Op.is]: null } } }),
        },
      ],
    });