UIQM-709 Duplicate LCCN checking query > Do not return instance/bib r…

…ecord that is set for deletion
folio-org · Oct 3, 2024 · 7f254c4 · 7f254c4
1 parent 30c579b
commit 7f254c4
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@
 * [UIQM-706](https://issues.folio.org/browse/UIQM-706) *BREAKING* Upgrade `marc-records-editor` to `6.0`.
 * [UIQM-698](https://issues.folio.org/browse/UIQM-698) Validate 006/007 field lengths.
 * [UIQM-704](https://issues.folio.org/browse/UIQM-704) Linked fields - combine split fields before sending for validation.
+* [UIQM-709](https://issues.folio.org/browse/UIQM-709) Duplicate LCCN checking query > Do not return instance/bib record that is set for deletion.
 
 ## [8.0.1] (https://github.com/folio-org/ui-quick-marc/tree/v8.0.1) (2024-04-18)
 

diff --git a/src/QuickMarcEditor/QuickMarcCreateWrapper.js b/src/QuickMarcEditor/QuickMarcCreateWrapper.js
@@ -84,7 +84,17 @@ const QuickMarcCreateWrapper = ({
     sourceFiles,
     fixedFieldSpec,
     instanceId: instance.id,
-  }), [initialValues, marcType, locations, linkableBibFields, linkingRules, sourceFiles, fixedFieldSpec, instance.id]);
+    instance,
+  }), [
+    initialValues,
+    marcType,
+    locations,
+    linkableBibFields,
+    linkingRules,
+    sourceFiles,
+    fixedFieldSpec,
+    instance,
+  ]);
   const { validate } = useValidation(validationContext, tenantId);
 
   const prepareForSubmit = useCallback((formValues) => {

diff --git a/src/QuickMarcEditor/QuickMarcDeriveWrapper.js b/src/QuickMarcEditor/QuickMarcDeriveWrapper.js
@@ -69,7 +69,8 @@ const QuickMarcDeriveWrapper = ({
     linkingRules,
     fixedFieldSpec,
     instanceId: instance.id,
-  }), [initialValues, marcType, linkableBibFields, linkingRules, fixedFieldSpec, instance.id]);
+    instance,
+  }), [initialValues, marcType, linkableBibFields, linkingRules, fixedFieldSpec, instance]);
   const { validate } = useValidation(validationContext);
 
   const prepareForSubmit = useCallback((formValues) => {

diff --git a/src/QuickMarcEditor/QuickMarcEditWrapper.js b/src/QuickMarcEditor/QuickMarcEditWrapper.js
@@ -101,6 +101,7 @@ const QuickMarcEditWrapper = ({
     linkingRules,
     fixedFieldSpec,
     instanceId: instance.id,
+    instance,
   }), [
     initialValues,
     marcType,
@@ -109,8 +110,7 @@ const QuickMarcEditWrapper = ({
     linkingRules,
     fixedFieldSpec,
     linksCount,
-    instance.naturalId,
-    instance.id,
+    instance,
   ]);
   const { validate } = useValidation(validationContext, tenantId);
 

diff --git a/src/hooks/useValidation/rules.js b/src/hooks/useValidation/rules.js
@@ -112,6 +112,9 @@ const BASE_BIB_VALIDATORS = [
   {
     tag: '010',
     validator: RULES.DUPLICATE_LCCN,
+    ignore: ({ duplicateLccnCheckingEnabled, instance }) => {
+      return !duplicateLccnCheckingEnabled || (instance.discoverySuppress || instance.staffSuppress);
+    },
     message: () => ({ id: 'ui-quick-marc.record.error.010.lccnDuplicated' }),
   },
 ];

diff --git a/src/hooks/useValidation/useValidation.test.js b/src/hooks/useValidation/useValidation.test.js
@@ -354,6 +354,7 @@ describe('useValidation', () => {
           marcType: MARC_TYPES.HOLDINGS,
           action: QUICK_MARC_ACTIONS.EDIT,
           locations,
+          instance: {},
         };
 
         testCommonValidationRules({ marcContext });
@@ -365,6 +366,7 @@ describe('useValidation', () => {
           marcType: MARC_TYPES.HOLDINGS,
           action: QUICK_MARC_ACTIONS.CREATE,
           locations,
+          instance: {},
         };
 
         testCommonValidationRules({ marcContext });
@@ -409,6 +411,7 @@ describe('useValidation', () => {
       linkableBibFields,
       linkingRules,
       fixedFieldSpec: fixedFieldSpecBib,
+      instance: {},
     };
 
     const record = {
@@ -651,6 +654,60 @@ describe('useValidation', () => {
         }));
       });
     });
+
+    describe('when instance is staff suppressed', () => {
+      it('should not validate LCCN duplication', async () => {
+        useOkapiKy.mockReturnValueOnce({
+          get: jest.fn().mockReturnValue({
+            json: jest.fn().mockResolvedValue({ instances: [{}] }),
+          }),
+        });
+        const { result } = renderHook(() => useValidation({
+          ...marcContext,
+          instance: {
+            staffSuppress: true,
+          },
+        }), {
+          wrapper: getWrapper(),
+        });
+
+        await result.current.validate(record.records);
+
+        expect(quickMarcContext.setValidationErrors).not.toHaveBeenCalledWith(expect.objectContaining({
+          4: [{
+            id: 'ui-quick-marc.record.error.010.lccnDuplicated',
+            severity: 'error',
+          }],
+        }));
+      });
+    });
+
+    describe('when instance is discovery suppressed', () => {
+      it('should not validate LCCN duplication', async () => {
+        useOkapiKy.mockReturnValueOnce({
+          get: jest.fn().mockReturnValue({
+            json: jest.fn().mockResolvedValue({ instances: [{}] }),
+          }),
+        });
+        const { result } = renderHook(() => useValidation({
+          ...marcContext,
+          instance: {
+            discoverySuppress: true,
+          },
+        }), {
+          wrapper: getWrapper(),
+        });
+
+        await result.current.validate(record.records);
+
+        expect(quickMarcContext.setValidationErrors).not.toHaveBeenCalledWith(expect.objectContaining({
+          4: [{
+            id: 'ui-quick-marc.record.error.010.lccnDuplicated',
+            severity: 'error',
+          }],
+        }));
+      });
+    });
   });
 
   describe('when validating Holdings record', () => {
@@ -889,6 +946,7 @@ describe('useValidation', () => {
         marcType: MARC_TYPES.HOLDINGS,
         action: QUICK_MARC_ACTIONS.EDIT,
         locations,
+        instance: {},
       };
 
       testBaseHoldingsValidation({ marcContext });
@@ -900,6 +958,7 @@ describe('useValidation', () => {
         marcType: MARC_TYPES.HOLDINGS,
         action: QUICK_MARC_ACTIONS.CREATE,
         locations,
+        instance: {},
       };
 
       testBaseHoldingsValidation({ marcContext });
@@ -944,6 +1003,7 @@ describe('useValidation', () => {
         linkableBibFields,
         linkingRules,
         fixedFieldSpec: fixedFieldSpecAuth,
+        instance: {},
       };
 
       const record = {
@@ -1039,6 +1099,60 @@ describe('useValidation', () => {
           }]);
         });
       });
+
+      describe('when instance is staff suppressed', () => {
+        it('should not validate LCCN duplication', async () => {
+          useOkapiKy.mockReturnValueOnce({
+            get: jest.fn().mockReturnValue({
+              json: jest.fn().mockResolvedValue({ instances: [{}] }),
+            }),
+          });
+          const { result } = renderHook(() => useValidation({
+            ...marcContext,
+            instance: {
+              staffSuppress: true,
+            },
+          }), {
+            wrapper: getWrapper(),
+          });
+
+          await result.current.validate(record.records);
+
+          expect(quickMarcContext.setValidationErrors).not.toHaveBeenCalledWith(expect.objectContaining({
+            4: [{
+              id: 'ui-quick-marc.record.error.010.lccnDuplicated',
+              severity: 'error',
+            }],
+          }));
+        });
+      });
+
+      describe('when instance is discovery suppressed', () => {
+        it('should not validate LCCN duplication', async () => {
+          useOkapiKy.mockReturnValueOnce({
+            get: jest.fn().mockReturnValue({
+              json: jest.fn().mockResolvedValue({ instances: [{}] }),
+            }),
+          });
+          const { result } = renderHook(() => useValidation({
+            ...marcContext,
+            instance: {
+              discoverySuppress: true,
+            },
+          }), {
+            wrapper: getWrapper(),
+          });
+
+          await result.current.validate(record.records);
+
+          expect(quickMarcContext.setValidationErrors).not.toHaveBeenCalledWith(expect.objectContaining({
+            4: [{
+              id: 'ui-quick-marc.record.error.010.lccnDuplicated',
+              severity: 'error',
+            }],
+          }));
+        });
+      });
     });
 
     describe('when action is CREATE', () => {
@@ -1076,6 +1190,7 @@ describe('useValidation', () => {
         linkableBibFields,
         linkingRules,
         fixedFieldSpec: fixedFieldSpecAuth,
+        instance: {},
       };
 
       const record = {

diff --git a/src/hooks/useValidation/validators.js b/src/hooks/useValidation/validators.js
@@ -442,18 +442,19 @@ export const validateFixedFieldLength = ({ marcRecords, fixedFieldSpec, marcType
 
   return undefined;
 };
-export const validateLccnDuplication = async ({
-  ky,
-  marcRecords,
-  duplicateLccnCheckingEnabled,
-  instanceId,
-  action,
-  marcType,
-}, rule) => {
-  if (!duplicateLccnCheckingEnabled) {
+export const validateLccnDuplication = async (context, rule) => {
+  if (rule.ignore?.(context)) {
     return undefined;
   }
 
+  const {
+    ky,
+    marcRecords,
+    instanceId,
+    action,
+    marcType,
+  } = context;
+
   const fields = marcRecords.filter(record => record.tag.match(rule.tag));
 
   const validateField = async (field) => {