refactor: remove unused error classes and clean up

weyoss · Mar 30, 2024 · 15bd959 · 15bd959
1 parent 3bfb8f1
commit 15bd959
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 378 deletions.
diff --git a/docs/api/README.md b/docs/api/README.md
@@ -41,10 +41,8 @@
 
 - [ConsumerError](classes/ConsumerError.md)
 - [ConsumerGroupDeleteError](classes/ConsumerGroupDeleteError.md)
-- [ConsumerGroupIdNotFoundError](classes/ConsumerGroupIdNotFoundError.md)
 - [ConsumerGroupIdNotSupportedError](classes/ConsumerGroupIdNotSupportedError.md)
 - [ConsumerGroupIdRequiredError](classes/ConsumerGroupIdRequiredError.md)
-- [ConsumerInvalidGroupIdError](classes/ConsumerInvalidGroupIdError.md)
 - [ConsumerMessageHandlerAlreadyExistsError](classes/ConsumerMessageHandlerAlreadyExistsError.md)
 - [ExchangeError](classes/ExchangeError.md)
 - [ExchangeFanOutError](classes/ExchangeFanOutError.md)

diff --git a/docs/api/classes/ConsumerError.md b/docs/api/classes/ConsumerError.md
@@ -12,14 +12,10 @@
 
   ↳↳ [`ConsumerGroupDeleteError`](ConsumerGroupDeleteError.md)
 
-  ↳↳ [`ConsumerGroupIdNotFoundError`](ConsumerGroupIdNotFoundError.md)
-
   ↳↳ [`ConsumerGroupIdNotSupportedError`](ConsumerGroupIdNotSupportedError.md)
 
   ↳↳ [`ConsumerGroupIdRequiredError`](ConsumerGroupIdRequiredError.md)
 
-  ↳↳ [`ConsumerInvalidGroupIdError`](ConsumerInvalidGroupIdError.md)
-
 ## Table of contents
 
 ### Constructors

diff --git a/docs/api/classes/ConsumerGroupIdNotFoundError.md b/docs/api/classes/ConsumerGroupIdNotFoundError.md
diff --git a/docs/api/classes/ConsumerInvalidGroupIdError.md b/docs/api/classes/ConsumerInvalidGroupIdError.md
diff --git a/src/lib/consumer-groups/_/_save-consumer-group.ts b/src/lib/consumer-groups/_/_save-consumer-group.ts
@@ -10,30 +10,17 @@
 import { ICallback, IEventBus, IRedisClient } from 'redis-smq-common';
 import { TRedisSMQEvent } from '../../../common/index.js';
 import { redisKeys } from '../../../common/redis-keys/redis-keys.js';
-import { ConsumerInvalidGroupIdError } from '../../consumer/index.js';
 import { IQueueParams } from '../../queue/index.js';
 
-function validateGroupId(groupId: string): string | false {
-  const lowerCase = groupId.toLowerCase();
-  const filtered = lowerCase.replace(
-    /(?:[a-z][a-z0-9]?)+(?:[-_]?[a-z0-9])*/,
-    '',
-  );
-  if (filtered.length) {
-    return false;
-  }
-  return lowerCase;
-}
-
 export function _saveConsumerGroup(
   redisClient: IRedisClient,
   eventBus: IEventBus<TRedisSMQEvent>,
   queue: IQueueParams,
   groupId: string,
   cb: ICallback<number>,
 ): void {
-  const gid = validateGroupId(groupId);
-  if (!gid) cb(new ConsumerInvalidGroupIdError());
+  const gid = redisKeys.validateRedisKey(groupId);
+  if (gid instanceof Error) cb(gid);
   else {
     const { keyQueueConsumerGroups } = redisKeys.getQueueKeys(queue, gid);
     redisClient.sadd(keyQueueConsumerGroups, gid, (err, reply) => {

diff --git a/src/lib/consumer/errors/consumer-group-id-not-found.error.ts b/src/lib/consumer/errors/consumer-group-id-not-found.error.ts