From 5ea1ee961888ec660faccccb7686e132fbaf674a Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Fri, 8 Sep 2023 21:39:00 +0800
Subject: [PATCH] test: fix ci problem

---
 .../src/components/modals/GroupDetail/Role/tabs/member.tsx   | 5 ++---
 packages/types/src/model/group.ts                            | 2 +-
 server/models/group/group.ts                                 | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/web/src/components/modals/GroupDetail/Role/tabs/member.tsx b/client/web/src/components/modals/GroupDetail/Role/tabs/member.tsx
index 857cdcb4..50de53f0 100644
--- a/client/web/src/components/modals/GroupDetail/Role/tabs/member.tsx
+++ b/client/web/src/components/modals/GroupDetail/Role/tabs/member.tsx
@@ -3,7 +3,7 @@ import { closeModal, openModal } from '@/components/Modal';
 import { SelectGroupMember } from '@/components/modals/SelectGroupMember';
 import { UserListItem } from '@/components/UserListItem';
 import { Button, Input } from 'antd';
-import React, { useCallback } from 'react';
+import React from 'react';
 import { Icon } from 'tailchat-design';
 import {
   model,
@@ -14,7 +14,6 @@ import {
   useGroupInfo,
   useMemoizedFn,
   useSearch,
-  useUserId,
   useUserInfoList,
 } from 'tailchat-shared';
 import _compact from 'lodash/compact';
@@ -27,7 +26,7 @@ export const RoleMember: React.FC<RoleMemberProps> = React.memo((props) => {
   const roleId = props.currentRoleInfo._id;
   const groupInfo = useGroupInfo(props.groupId);
   const members = (groupInfo?.members ?? []).filter((m) =>
-    m.roles.includes(roleId)
+    (m.roles ?? []).includes(roleId)
   );
   const memberIds = members.map((m) => m.userId);
   const userInfoList = useUserInfoList(memberIds);
diff --git a/packages/types/src/model/group.ts b/packages/types/src/model/group.ts
index 578f9c8b..bde3b690 100644
--- a/packages/types/src/model/group.ts
+++ b/packages/types/src/model/group.ts
@@ -6,7 +6,7 @@ export interface GroupInfo {
   description: string;
   members: GroupMember[];
   panels: GroupPanel[];
-  roles?: GroupRole[];
+  roles: GroupRole[];
   /**
    * 所有人的权限列表
    * 为群组中的最低权限
diff --git a/server/models/group/group.ts b/server/models/group/group.ts
index 3e20306c..70766d88 100644
--- a/server/models/group/group.ts
+++ b/server/models/group/group.ts
@@ -157,7 +157,7 @@ export class Group extends TimeStamps implements Base {
     type: () => GroupRole,
     default: [],
   })
-  roles?: GroupRole[];
+  roles: GroupRole[];
 
   /**
    * 所有人的权限列表