refactor: extract shouldShortCircuit & shouldSkipCurrentGroup calculation inside mixin

Author: arnabrahman

packages/batch/src/SqsFifo.ts

@@ -114,5 +114,29 @@ export function SqsFifo<
     _setCurrentGroup(group?: string): void {
       this._currentGroupId = group;
     }
+
+    /**
+     * Determines whether the current group should be short-circuited.
+     * If we have any failed messages, we should then short circuit the process and
+     * fail remaining messages unless `skipGroupOnError` is true
+     */
+    _shouldShortCircuit(): boolean {
+      return (
+        !this.options?.skipGroupOnError && this.failureMessages.length !== 0
+      );
+    }
+
+    /**
+     * Determines whether the current group should be skipped.
+     * If `skipGroupOnError` is true and the current group has previously failed,
+     * then we should skip processing the current group.
+     */
+    _shouldSkipCurrentGroup(): boolean {
+      return (
+        (this.options?.skipGroupOnError ?? false) &&
+        this._currentGroupId &&
+        this._failedGroupIds.has(this._currentGroupId)
+      );
+    }
   };
 }

packages/batch/src/SqsFifoPartialProcessor.ts

@@ -66,22 +66,11 @@ class SqsFifoPartialProcessor extends SqsFifo(BatchProcessorSync) {
     for (const record of this.records) {
       this._setCurrentGroup((record as SQSRecord).attributes?.MessageGroupId);
 
-      // If we have any failed messages, we should then short circuit the process and
-      // fail remaining messages unless `skipGroupOnError` is true
-      const shouldShortCircuit =
-        !this.options?.skipGroupOnError && this.failureMessages.length !== 0;
-      if (shouldShortCircuit) {
+      if (this._shouldShortCircuit()) {
         return this._shortCircuitProcessing(currentIndex, processedRecords);
       }
 
-      // If `skipGroupOnError` is true and the current group has previously failed,
-      // then we should skip processing the current group.
-      const shouldSkipCurrentGroup =
-        this.options?.skipGroupOnError &&
-        this._currentGroupId &&
-        this._failedGroupIds.has(this._currentGroupId);
-
-      const result = shouldSkipCurrentGroup
+      const result = this._shouldSkipCurrentGroup()
         ? this._processFailRecord(
             record,
             new SqsFifoMessageGroupShortCircuitError()

packages/batch/src/SqsFifoPartialProcessorAsync.ts

@@ -66,22 +66,11 @@ class SqsFifoPartialProcessorAsync extends SqsFifo(BatchProcessor) {
     for (const record of this.records) {
       this._setCurrentGroup((record as SQSRecord).attributes?.MessageGroupId);
 
-      // If we have any failed messages, we should then short circuit the process and
-      // fail remaining messages unless `skipGroupOnError` is true
-      const shouldShortCircuit =
-        !this.options?.skipGroupOnError && this.failureMessages.length !== 0;
-      if (shouldShortCircuit) {
+      if (this._shouldShortCircuit()) {
         return this._shortCircuitProcessing(currentIndex, processedRecords);
       }
 
-      // If `skipGroupOnError` is true and the current group has previously failed,
-      // then we should skip processing the current group.
-      const shouldSkipCurrentGroup =
-        this.options?.skipGroupOnError &&
-        this._currentGroupId &&
-        this._failedGroupIds.has(this._currentGroupId);
-
-      const result = shouldSkipCurrentGroup
+      const result = this._shouldSkipCurrentGroup()
         ? this._processFailRecord(
             record,
             new SqsFifoMessageGroupShortCircuitError()