From ead5f5c2f4bebd2baa61a3720664669c7039fc24 Mon Sep 17 00:00:00 2001
From: Agustin Moyano <agustinmoyano@theke.io>
Date: Tue, 3 Jan 2023 16:09:10 -0300
Subject: [PATCH] Bug 31799: (follow-up) Tidy up and fix duplicate barcode
 handling

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 Koha/REST/V1/Biblios.pm         | 28 ++++++++--------------------
 t/db_dependent/api/v1/biblios.t |  2 +-
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Koha/REST/V1/Biblios.pm b/Koha/REST/V1/Biblios.pm
index bd4362250a..6457d49d7a 100644
--- a/Koha/REST/V1/Biblios.pm
+++ b/Koha/REST/V1/Biblios.pm
@@ -431,32 +431,20 @@ sub update_item {
 
         $item->set_from_api($body);
 
-        my $barcodeSearch;
-        $barcodeSearch = Koha::Items->search( { barcode => $body->{external_id} } ) if defined $body->{external_id};
-
-        if ( $barcodeSearch
-            && ($barcodeSearch->count > 1
-                || ($barcodeSearch->count == 1
-                    && $barcodeSearch->next->itemnumber != $item->itemnumber
-                )
-            )
-        )
-        {
-            return $c->render(
-                status  => 400,
-                openapi => { error => "Barcode not unique" }
-            );
-        }
-
-        my $storedItem = $item->store;
-        $storedItem->discard_changes;
+        $item->store->discard_changes;
 
         $c->render(
             status => 200,
-            openapi => $storedItem->to_api
+            openapi => $item->to_api
         );
     }
     catch {
+        if ( blessed $_ and $_->isa('Koha::Exceptions::Object::DuplicateID') ) {
+            return $c->render(
+                status  => 409,
+                openapi => { error => 'Duplicate barcode.' }
+            );
+        }
         $c->unhandled_exception($_);
     }
 }
diff --git a/t/db_dependent/api/v1/biblios.t b/t/db_dependent/api/v1/biblios.t
index 92293731ce..eb6dcaa78b 100755
--- a/t/db_dependent/api/v1/biblios.t
+++ b/t/db_dependent/api/v1/biblios.t
@@ -1792,7 +1792,7 @@ subtest 'update_item() tests' => sub {
   $t->put_ok("//$userid:$password@/api/v1/biblios/$biblio_id/items/$item_id" => json => {
       external_id => $other_item->barcode,
     })
-    ->status_is(400, 'Barcode not unique');
+    ->status_is(409, 'Barcode not unique');
 
   $t->put_ok("//$userid:$password@/api/v1/biblios/$biblio_id/items/$item_id" => json => {
       replacement_price => 30,
-- 
2.39.5