@juzi/wechaty-puppet-service 1.0.14 → 1.0.16

package/src/server/puppet-implementation.ts

@@ -1492,281 +1492,235 @@ function puppetImplementation (
       }
     },
 
-    tagContactAdd: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'tagContactAdd()')
+    /**
+     *
+     * tag section
+     *
+     */
+
+    tagContactTagAdd: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagContactTagAdd()')
 
       try {
-        const tagId = call.request.getId()
+        const tagGroupId = call.request.getTagGroupId()
+        const tagId = call.request.getTagId()
         const contactId = call.request.getContactId()
 
-        await puppet.tagContactAdd(tagId, contactId)
-
-        return callback(null, new grpcPuppet.TagContactAddResponse())
+        await puppet.tagContactTagAdd(tagGroupId, tagId, contactId)
 
+        return callback(null, new grpcPuppet.TagContactTagAddResponse())
       } catch (e) {
-        return grpcError('tagContactAdd', e, callback)
+        return grpcError('tagContactTagAdd', e, callback)
       }
     },
 
-    tagContactDelete: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'tagContactDelete()')
+    tagContactTagRemove: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagContactTagRemove()')
 
       try {
-        const tagId = call.request.getId()
-
-        await puppet.tagContactDelete(tagId)
+        const tagGroupId = call.request.getTagGroupId()
+        const tagId = call.request.getTagId()
+        const contactId = call.request.getContactId()
 
-        return callback(null, new grpcPuppet.TagContactDeleteResponse())
+        await puppet.tagContactTagRemove(tagGroupId, tagId, contactId)
 
+        return callback(null, new grpcPuppet.TagContactTagRemoveResponse())
       } catch (e) {
-        return grpcError('tagContactDelete', e, callback)
+        return grpcError('tagContactTagRemove', e, callback)
       }
     },
 
-    tagContactList: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'tagContactList()')
+    tagGroupAdd: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagGroupAdd()')
 
       try {
-        const contactId = call.request.getContactId()
-
-        /**
-         * for a specific contact
-         */
-        if (contactId) {
-          const tagIdList = await puppet.tagContactList(contactId)
-
-          const response = new grpcPuppet.TagContactListResponse()
-          response.setIdsList(tagIdList)
-
-          return callback(null, new grpcPuppet.TagContactListResponse())
-        }
-
-        {
-          /**
-            * Huan(202110): Deprecated: will be removed after Dec 31, 2022
-            */
-          const contactIdWrapper = call.request.getContactIdStringValueDeprecated()
-
-          if (contactIdWrapper) {
-            const contactId = contactIdWrapper.getValue()
-
-            const tagIdList = await puppet.tagContactList(contactId)
+        const tagGroupName = call.request.getTagGroupName()
 
-            const response = new grpcPuppet.TagContactListResponse()
-            response.setIdsList(tagIdList)
+        const result = await puppet.tagGroupAdd(tagGroupName)
+        const payload = new grpcPuppet.TagGroupPayload()
+        const response = new grpcPuppet.TagGroupAddResponse()
 
-            return callback(null, new grpcPuppet.TagContactListResponse())
-          }
+        if (result) {
+          payload.setId(result.id)
+          payload.setName(result.name)
+          response.setPayload(payload)
         }
 
-        /**
-         * get all tags for all contact
-         */
-        const tagIdList = await puppet.tagContactList()
-
-        const response = new grpcPuppet.TagContactListResponse()
-        response.setIdsList(tagIdList)
-
         return callback(null, response)
-
-      } catch (e) {
-        return grpcError('tagContactList', e, callback)
-      }
-    },
-
-    tagContactRemove: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'tagContactRemove()')
-
-      try {
-        const tagId = call.request.getId()
-        const contactId = call.request.getContactId()
-
-        await puppet.tagContactRemove(tagId, contactId)
-
-        return callback(null, new grpcPuppet.TagContactRemoveResponse())
-
       } catch (e) {
-        return grpcError('tagContactRemove', e, callback)
+        return grpcError('tagGroupAdd', e, callback)
       }
     },
 
-    /**
-     *
-     * corp-tag section
-     *
-     */
-
-    corpTagContactTagAdd: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagContactTagAdd()')
-
-      try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
-        const corpTagId = call.request.getCorpTagId()
-        const contactId = call.request.getContactId()
-
-        await puppet.corpTagContactTagAdd(corpTagGroupId, corpTagId, contactId)
-
-        return callback(null, new grpcPuppet.CorpTagContactTagAddResponse())
-      } catch (e) {
-        return grpcError('corpTagContactTagAdd', e, callback)
-      }
-    },
-
-    corpTagContactTagRemove: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagContactTagRemove()')
+    tagGroupDelete: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagGroupDelete()')
 
       try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
-        const corpTagId = call.request.getCorpTagId()
-        const contactId = call.request.getContactId()
+        const tagGroupId = call.request.getTagGroupId()
 
-        await puppet.corpTagContactTagRemove(corpTagGroupId, corpTagId, contactId)
+        await puppet.tagGroupDelete(tagGroupId)
 
-        return callback(null, new grpcPuppet.CorpTagContactTagRemoveResponse())
+        return callback(null, new grpcPuppet.TagGroupDeleteResponse())
       } catch (e) {
-        return grpcError('corpTagContactTagRemove', e, callback)
+        return grpcError('tagGroupDelete', e, callback)
       }
     },
 
-    corpTagGroupAdd: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagGroupAdd()')
+    tagTagAdd: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagTagAdd()')
 
       try {
-        const corpTagGroupName = call.request.getCorpTagGroupName()
+        const tagGroupId = call.request.getTagGroupId()
+        const tagName = call.request.getTagName()
 
-        const result = await puppet.corpTagGroupAdd(corpTagGroupName)
-        const payload = new grpcPuppet.CorpTagGroupPayload()
-        const response = new grpcPuppet.CorpTagGroupAddResponse()
+        const result = await puppet.tagTagAdd(tagGroupId, tagName)
+        const payload = new grpcPuppet.TagPayload()
+        const response = new grpcPuppet.TagTagAddResponse()
 
         if (result) {
           payload.setId(result.id)
           payload.setName(result.name)
+          payload.setType(result.type)
+          if (result.groupId) {
+            payload.setGroupId(result.groupId)
+          }
           response.setPayload(payload)
         }
 
         return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagGroupAdd', e, callback)
+        return grpcError('tagTagAdd', e, callback)
       }
     },
 
-    corpTagGroupDelete: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagGroupDelete()')
+    tagTagDelete: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagTagDelete()')
 
       try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
+        const tagGroupId = call.request.getTagGroupId()
+        const tagId = call.request.getTagId()
 
-        await puppet.corpTagGroupDelete(corpTagGroupId)
+        await puppet.tagTagDelete(tagGroupId, tagId)
 
-        return callback(null, new grpcPuppet.CorpTagGroupDeleteResponse())
+        return callback(null, new grpcPuppet.TagTagDeleteResponse())
       } catch (e) {
-        return grpcError('corpTagGroupDelete', e, callback)
+        return grpcError('tagTagDelete', e, callback)
       }
     },
 
-    corpTagTagAdd: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagTagAdd()')
+    tagGroupList: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagGroupList()')
+      void call
 
       try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
-        const corpTagName = call.request.getCorpTagName()
-
-        const result = await puppet.corpTagTagAdd(corpTagGroupId, corpTagName)
-        const payload = new grpcPuppet.CorpTagPayload()
-        const response = new grpcPuppet.CorpTagTagAddResponse()
-
-        if (result) {
-          payload.setId(result.id)
-          payload.setName(result.name)
-          payload.setGroupId(result.groupId)
-          response.setPayload(payload)
-        }
+        const result = await puppet.tagGroupList()
+        const payloads = result.map(tagGroup => {
+          const payload = new grpcPuppet.TagGroupPayload()
+          payload.setId(tagGroup.id)
+          payload.setName(tagGroup.name)
+          return payload
+        })
+        const response = new grpcPuppet.TagGroupListResponse()
+        response.setPayloadsList(payloads)
 
         return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagTagAdd', e, callback)
+        return grpcError('tagGroupList', e, callback)
       }
     },
 
-    corpTagTagDelete: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagTagDelete()')
+    tagGroupTagList: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagGroupTagList()')
 
       try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
-        const corpTagId = call.request.getCorpTagId()
+        const tagGroupId = call.request.getTagGroupId()
 
-        await puppet.corpTagTagDelete(corpTagGroupId, corpTagId)
+        const result = await puppet.tagGroupTagList(tagGroupId)
+        const payloads = result.map(tag => {
+          const payload = new grpcPuppet.TagPayload()
+          payload.setId(tag.id)
+          payload.setName(tag.name)
+          payload.setType(tag.type)
+          if (tag.groupId) {
+            payload.setGroupId(tag.groupId)
+          }
+          return payload
+        })
+        const response = new grpcPuppet.TagTagListResponse()
+        response.setPayloadsList(payloads)
 
-        return callback(null, new grpcPuppet.CorpTagTagDeleteResponse())
+        return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagTagDelete', e, callback)
+        return grpcError('tagTagList', e, callback)
       }
     },
 
-    corpTagGroupList: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagGroupList()')
+    tagTagList: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagTagList()')
       void call
 
       try {
-        const result = await puppet.corpTagGroupList()
-        const payloads = result.map(corpTagGroup => {
-          const payload = new grpcPuppet.CorpTagGroupPayload()
-          payload.setId(corpTagGroup.id)
-          payload.setName(corpTagGroup.name)
+        const result = await puppet.tagTagList()
+        const payloads = result.map(tag => {
+          const payload = new grpcPuppet.TagPayload()
+          payload.setId(tag.id)
+          payload.setName(tag.name)
+          payload.setType(tag.type)
+          if (tag.groupId) {
+            payload.setGroupId(tag.groupId)
+          }
           return payload
         })
-        const response = new grpcPuppet.CorpTagGroupListResponse()
+        const response = new grpcPuppet.TagTagListResponse()
         response.setPayloadsList(payloads)
 
         return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagGroupList', e, callback)
+        return grpcError('tagTagList', e, callback)
       }
     },
 
-    corpTagTagList: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagTagList()')
+    tagContactTagList: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagContactTagList()')
 
       try {
-        const corpTagGroupId = call.request.getCorpTagGroupId()
+        const contactId = call.request.getContactId()
 
-        const result = await puppet.corpTagTagList(corpTagGroupId)
-        const payloads = result.map(corpTag => {
-          const payload = new grpcPuppet.CorpTagPayload()
-          payload.setId(corpTag.id)
-          payload.setName(corpTag.name)
-          payload.setGroupId(corpTag.groupId)
+        const result = await puppet.tagContactTagList(contactId)
+        const payloads = result.map(tag => {
+          const payload = new grpcPuppet.TagPayload()
+          payload.setId(tag.id)
+          payload.setName(tag.name)
+          payload.setType(tag.type)
+          if (tag.groupId) {
+            payload.setGroupId(tag.groupId)
+          }
           return payload
         })
-        const response = new grpcPuppet.CorpTagTagListResponse()
+        const response = new grpcPuppet.TagContactTagListResponse()
         response.setPayloadsList(payloads)
 
         return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagTagList', e, callback)
+        return grpcError('tagContactTagList', e, callback)
       }
     },
 
-    corpTagContactTagList: async (call, callback) => {
-      log.verbose('PuppetServiceImpl', 'corpTagContactTagList()')
+    tagTagContactList: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagTagContactList()')
 
       try {
-        const contactId = call.request.getContactId()
+        const tagGroupId = call.request.getTagGroupId()
+        const tagId = call.request.getTagId()
 
-        const result = await puppet.corpTagTagList(contactId)
-        const payloads = result.map(corpTag => {
-          const payload = new grpcPuppet.CorpTagPayload()
-          payload.setId(corpTag.id)
-          payload.setName(corpTag.name)
-          payload.setGroupId(corpTag.groupId)
-          return payload
-        })
-        const response = new grpcPuppet.CorpTagContactTagListResponse()
-        response.setPayloadsList(payloads)
+        const result = await puppet.tagTagContactList(tagGroupId, tagId)
+
+        const response = new grpcPuppet.TagTagContactListResponse()
+        response.setPayloadsList(result)
 
         return callback(null, response)
       } catch (e) {
-        return grpcError('corpTagContactTagList', e, callback)
+        return grpcError('tagTagContactList', e, callback)
       }
     },