Merge pull request #343 from erxes/meeting

erxes · Sep 27, 2023 · feb7098 · feb7098
2 parents 8fd1932 + 83395e6
commit feb7098
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 42 deletions.
diff --git a/packages/plugin-meetings-api/src/graphql/resolvers/mutations/pinnedUser.ts b/packages/plugin-meetings-api/src/graphql/resolvers/mutations/pinnedUser.ts
@@ -4,18 +4,11 @@ const pinnedUserMutations = {
   // /**
   //  * Creates a new pinnedUser
   //  */
-  async meetingPinnedUserAdd(
-    _root,
-    { pinnedUserIds },
-    { models, user }: IContext
-  ) {
-    return await models.PinnedUsers.createPinnedUser(pinnedUserIds, user);
-  },
 
   // /**
   //  * Edits a pinnedUser
   //  */
-  async meetingPinnedUserEdit(
+  async meetingPinnedUserUpdate(
     _root,
     { pinnedUserIds },
     { models, user }: IContext

diff --git a/packages/plugin-meetings-api/src/graphql/schema/pinnedUser.ts b/packages/plugin-meetings-api/src/graphql/schema/pinnedUser.ts
@@ -2,8 +2,7 @@ const params = `
   pinnedUserIds: [String]
 `;
 export const mutations = `
-  meetingPinnedUserAdd(${params}): PinnedUsers
-  meetingPinnedUserEdit(${params}): PinnedUsers
+  meetingPinnedUserUpdate(${params}): PinnedUsers
   `;
 
 export const queries = `

diff --git a/packages/plugin-meetings-api/src/models/pinnedUsers.ts b/packages/plugin-meetings-api/src/models/pinnedUsers.ts
@@ -8,10 +8,6 @@ import {
 import { checkLogin } from '@erxes/api-utils/src';
 
 export interface IPinnedUserModel extends Model<IPinnedUserDocument> {
-  createPinnedUser(
-    pinnedUserIds: String[],
-    user: IUser
-  ): Promise<IPinnedUserDocument>;
   updatePinnedUser(
     pinnedUserIds: String[],
     user: IUser
@@ -20,21 +16,21 @@ export interface IPinnedUserModel extends Model<IPinnedUserDocument> {
 
 export const loadPinnedUserClass = (model: IModels) => {
   class PinnedUser {
-    // create
-    public static async createPinnedUser(pinnedUserIds, user) {
+    // update
+    public static async updatePinnedUser(pinnedUserIds, user) {
+      const pinnedUsers = await model.PinnedUsers.findOne({ userId: user._id });
+
+      if (pinnedUsers) {
+        return await model.PinnedUsers.updateOne(
+          { userId: user._id },
+          { $set: { pinnedUserIds } }
+        ).then(err => console.error(err));
+      }
       return await model.PinnedUsers.create({
         pinnedUserIds,
         userId: user._id
       });
     }
-
-    // update
-    public static async updatePinnedUser(pinnedUserIds, user) {
-      return await model.PinnedUsers.updateOne(
-        { userId: user._id },
-        { $set: { pinnedUserIds } }
-      ).then(err => console.error(err));
-    }
   }
 
   pinnedUserSchema.loadClass(PinnedUser);

diff --git a/packages/plugin-meetings-ui/src/containers/myCalendar/ChooseOwnerForm.tsx b/packages/plugin-meetings-ui/src/containers/myCalendar/ChooseOwnerForm.tsx
@@ -19,11 +19,7 @@ export const ChooseOwnerFormContainer = (props: Props) => {
   }: IButtonMutateProps) => {
     return (
       <ButtonMutate
-        mutation={
-          object && object !== {}
-            ? mutations.editPinnedUser
-            : mutations.addPinnedUser
-        }
+        mutation={mutations.updatePinnedUser}
         variables={values}
         callback={callback}
         isSubmitted={isSubmitted}

diff --git a/packages/plugin-meetings-ui/src/graphql/mutations.ts b/packages/plugin-meetings-ui/src/graphql/mutations.ts
@@ -58,17 +58,9 @@ const editTopic = `
   }
   `;
 
-const editPinnedUser = `
- mutation meetingPinnedUserEdit($pinnedUserIds: [String]) {
-  meetingPinnedUserEdit(pinnedUserIds: $pinnedUserIds) {
-    userId
-    pinnedUserIds
-  }
-}
-  `;
-const addPinnedUser = `
-  mutation meetingPinnedUserAdd($pinnedUserIds: [String]) {
-    meetingPinnedUserAdd(pinnedUserIds: $pinnedUserIds) {
+const updatePinnedUser = `
+  mutation meetingPinnedUserUpdate($pinnedUserIds: [String]) {
+    meetingPinnedUserUpdate(pinnedUserIds: $pinnedUserIds) {
       userId
       pinnedUserIds
   }
@@ -81,6 +73,5 @@ export default {
   remove,
   editMeeting,
   editMeetingStatus,
-  editPinnedUser,
-  addPinnedUser
+  updatePinnedUser
 };