Attachment #159103 for bug #33036

View | Details | Raw Unified | Return to bug 33036
Collapse All | Expand All

Lines 22-32 use Modern::Perl; Link Here

(-)a/Koha/Biblio.pm (-1 / +63 lines)
22	use List::MoreUtils qw( any );	22	use List::MoreUtils qw( any );
23	use URI;	23	use URI;
24	use URI::Escape qw( uri_escape_utf8 );	24	use URI::Escape qw( uri_escape_utf8 );
		25	use Try::Tiny;
25		26
26	use C4::Koha qw( GetNormalizedISBN GetNormalizedUPC GetNormalizedOCLCNumber );	27	use C4::Koha qw( GetNormalizedISBN GetNormalizedUPC GetNormalizedOCLCNumber );
		28	use C4::Biblio qw( DelBiblio AddBiblio ModBiblio );
		29	use C4::Serials qw( CountSubscriptionFromBiblionumber );
		30	use C4::Reserves qw( MergeHolds );
		31	use C4::Acquisition qw( ModOrder GetOrdersByBiblionumber );
27		32
28	use Koha::Database;	33	use Koha::Database;
29	use Koha::DateUtils qw( dt_from_string );	34	use Koha::DateUtils qw( dt_from_string );
		35	use Koha::Exception;
30		36
31	use base qw(Koha::Object);	37	use base qw(Koha::Object);
32		38
Lines 1919-1924 sub opac_summary_html { Link Here
1919	return $summary_html;	1925	return $summary_html;
1920	}	1926	}
1921		1927
		1928	=head3 merge_with
		1929
		1930	my $biblio = Koha::Biblios->find($biblionumber);
		1931	$biblio->merge_with(\@biblio_ids);
		1932
		1933	This subroutine merges a list of bibliographic records into the bibliographic record.
		1934	This function DOES NOT CHANGE the bibliographic metadata of the record. But it links all
		1935	items, holds, subscriptions, serials issues and article_requests to the record. After doing changes
		1936	bibliographic records listed are deleted
		1937
		1938	=cut
		1939
		1940	sub merge_with {
		1941	my ( $self, $biblio_ids ) = @_;
		1942
		1943	my $schema = Koha::Database->new()->schema();
		1944	my $ref_biblionumber = $self->biblionumber;
		1945	my %results = ( 'biblio_id' => $ref_biblionumber, 'merged_ids' => [] );
		1946
		1947	# Ensure the keeper isn't in the list of records to merge
		1948	my @biblio_ids_to_merge = grep { $_ ne $ref_biblionumber } @$biblio_ids;
		1949
		1950	try {
		1951	$schema->txn_do(sub {
		1952	foreach my $bn_merge (@biblio_ids_to_merge) {
		1953	my $from_biblio = Koha::Biblios->find($bn_merge);
		1954	$from_biblio->items->move_to_biblio($self);
		1955	$from_biblio->article_requests->update( { biblionumber => $ref_biblionumber }, { no_triggers => 1 } );
		1956
		1957	for my $resultset_name (qw(Subscription Subscriptionhistory Serial Suggestion)) {
		1958	$schema->resultset($resultset_name)->search({ biblionumber => $bn_merge })->update({biblionumber => $ref_biblionumber});
		1959	}
		1960
		1961	# TODO should this be ported to more modern DB usage (i.e. DBIx::Class)?
		1962	my @allorders = GetOrdersByBiblionumber($bn_merge);
		1963	foreach my $myorder (@allorders) {
		1964	$myorder->{'biblionumber'} = $ref_biblionumber;
		1965	ModOrder($myorder);
		1966	# TODO : add error control (in ModOrder?)
		1967	}
		1968	# Move holds
		1969	MergeHolds( $schema->storage->dbh, $ref_biblionumber, $bn_merge );
		1970	my $error = DelBiblio($bn_merge); #DelBiblio return undef unless an error occurs
		1971	if ($error) {
		1972	die $error;
		1973	} else {
		1974	push( @{$results{merged_ids}}, $bn_merge );
		1975	}
		1976	}
		1977	});
		1978	} catch {
		1979	Koha::Exception->throw($_);
		1980	};
		1981	return \%results;
		1982	}
		1983
1922	=head2 Internal methods	1984	=head2 Internal methods
1923		1985
1924	=head3 type	1986	=head3 type




use MARC::Record::MiJ;

use Try::Tiny qw( catch try );
use JSON      qw( decode_json );

=head1 API


    };
}

=head3 merge

Controller function that handles merging two biblios. If an optional
MARCXML is provided as the request body, this MARCXML replaces the
bibliodata of the merge target biblio. Syntax format inside the request body
must match with the Marc format used into Koha installation (MARC21 or UNIMARC)

=cut

sub merge {
    my $c                = shift->openapi->valid_input or return;
    my $ref_biblionumber = $c->param('biblio_id');
    my $json             = decode_json( $c->req->body );
    my $bn_merge         = $json->{'biblio_id_to_merge'};
    my $framework        = $json->{'framework_to_use'};
    my $rules            = $json->{'rules'};
    my $override_rec     = $json->{'datarecord'};

    if ( ( !defined $rules ) || ( $rules eq '' ) ) { $rules        = 'override'; }
    if ( ( !defined $override_rec ) )              { $override_rec = ''; }
    if ( ( !defined $framework ) )                 { $framework    = ''; }

    my $biblio = Koha::Biblios->find($ref_biblionumber);
    if ( not defined $biblio ) {
        return $c->render(
            status => 404,
            json   => { error => sprintf( "[%s] biblio to merge into not found", $ref_biblionumber ) }
        );
    }
    my $frombib = Koha::Biblios->find($bn_merge);
    if ( not defined $frombib ) {
        return $c->render(
            status => 404,
            json   => { error => sprintf( "[%s] from which to merge not found", $bn_merge ) }
        );
    }

    if ( ( $rules eq 'override_ext' ) && ( $override_rec eq '' ) ) {
        return $c->render(
            status => 404,
            json   => {
                error =>
                    "With the rule 'override_ext' you need to insert a bib record in marc-in-json format into 'record' field."
            }
        );
    }

    if ( ( $rules eq 'override' ) && ( $framework ne '' ) ) {
        return $c->render(
            status => 404,
            json   => { error => "With the rule 'override' you can not use the field 'framework_to_use'." }
        );
    }

    my $results;
    eval {
        if ( $rules eq 'override_ext' ) {
            my $record = MARC::Record::MiJ->new_from_mij_structure($override_rec);
            $record->encoding('UTF-8');
            if ( $framework eq '' ) { $framework = $biblio->frameworkcode; }
            my $chk = ModBiblio( $record, $ref_biblionumber, $framework );
            if ( $chk != 1 ) { die "Error on ModBiblio"; }    # ModBiblio returns 1 if everything as gone well
            my @biblio_ids_to_merge = ($bn_merge);
            $results = $biblio->merge_with( \@biblio_ids_to_merge );
        }
        if ( $rules eq 'override' ) {
            my @biblio_ids_to_merge = ($bn_merge);
            $results = $biblio->merge_with( \@biblio_ids_to_merge );
        }
    };
    if ($@) {
        return $c->render( status => 400, json => { error => $@ } );
    } else {
        $c->respond_to(
            mij => {
                status => 200,
                format => 'mij',
                data   => $biblio->metadata->record->to_mij
            }
        );
    }
}

1;




---
type: object
properties:
  biblio_id_to_merge:
    type: integer
    description: Biblionumber from which to merge
  rules:
    type:
      - string
      - "null"
    description: Internally identifier of a merge algoritm. Now two identifier are supported, 'override' and 'override_ext'.
      'override' is to use when you the bibliographic data of biblio_id as resulting bibliographic data. The null value is equivalent
       of 'override'.
      'override_ext' is to use only with a value in datarecord field. In fact is mandatory to use if you insert a record inside datarecord field.
  framework_to_use:
    type:
      - string
      - "null"
    description: Framework code, you can use it only with a value in datarecord field. With null value it uses the framework
      code of record to be merged into.
  datarecord:
    description: Bibliographic record used as result of the merge. It uses the format MARC-in-JSON
    type:
      - object
      - "null"
additionalProperties: false
required:
  - biblio_id_to_merge




"/biblios/{biblio_id}/merge":
  post:
    x-mojo-to: Biblios#merge
    operationId: mergeBiblios
    tags:
        - merge_biblios
    summary: Merge Biblios
    parameters:
      - name: biblio_id
        in: path
        description: Bilblionumber
        required: true
        type: string
      - name: body
        in: body
        required: true
        description: JSON Object with params and an optional marc record in MARC-in-JSON format
        schema:
          $ref: "../swagger.yaml#/definitions/merge_biblios"
    consumes:
      - application/json
    produces:
      - application/marc-in-json
    responses:
      '200':
        description: The merge result as a biblio record
      '404':
        description: Biblio not found
        schema:
          "$ref": "../swagger.yaml#/definitions/error"
      '401':
        description: Authentication required
        schema:
          "$ref": "../swagger.yaml#/definitions/error"
      '403':
        description: Access forbidden
        schema:
          "$ref": "../swagger.yaml#/definitions/error"
      '500':
        description: Internal server error
        schema:
          "$ref": "../swagger.yaml#/definitions/error"
      '503':
        description: Under maintenance
        schema:
          "$ref": "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        catalogue: "editcatalogue"

Lines 118-123 definitions: Link Here

(-)a/api/v1/swagger/swagger.yaml (+4 lines)
118	$ref: ./definitions/job.yaml	118	$ref: ./definitions/job.yaml
119	library:	119	library:
120	$ref: ./definitions/library.yaml	120	$ref: ./definitions/library.yaml
		121	merge_biblios:
		122	$ref: ./definitions/merge_biblios.yaml
121	order:	123	order:
122	$ref: ./definitions/order.yaml	124	$ref: ./definitions/order.yaml
123	patron:	125	patron:
Lines 243-248 paths: Link Here
243	$ref: "./paths/biblios_item_groups.yaml#/~1biblios~1{biblio_id}~1item_groups~1{item_group_id}~1items"	245	$ref: "./paths/biblios_item_groups.yaml#/~1biblios~1{biblio_id}~1item_groups~1{item_group_id}~1items"
244	"/biblios/{biblio_id}/item_groups/{item_group_id}/items/{item_id}":	246	"/biblios/{biblio_id}/item_groups/{item_group_id}/items/{item_id}":
245	$ref: "./paths/biblios_item_groups.yaml#/~1biblios~1{biblio_id}~1item_groups~1{item_group_id}~1items~1{item_id}"	247	$ref: "./paths/biblios_item_groups.yaml#/~1biblios~1{biblio_id}~1item_groups~1{item_group_id}~1items~1{item_id}"
		248	"/biblios/{biblio_id}/merge":
		249	$ref: "./paths/biblios_merge.yaml#/~1biblios~1{biblio_id}~1merge"
246	"/cash_registers/{cash_register_id}/cashups":	250	"/cash_registers/{cash_register_id}/cashups":
247	$ref: "./paths/cash_registers.yaml#/~1cash_registers~1{cash_register_id}~1cashups"	251	$ref: "./paths/cash_registers.yaml#/~1cash_registers~1{cash_register_id}~1cashups"
248	"/cashups/{cashup_id}":	252	"/cashups/{cashup_id}":




    # Rewriting the leader
    my $biblio = Koha::Biblios->find($ref_biblionumber);
    $record->leader($biblio->metadata->record->leader());
    #Take new framework code
    my $frameworkcode = $input->param('frameworkcode');

    # Modifying the reference record
    ModBiblio($record, $ref_biblionumber, $frameworkcode);

    # Moving items and article requests from the other record to the reference record
    $biblio = $biblio->get_from_storage;
    foreach my $biblionumber (@biblionumbers) {
        my $from_biblio = Koha::Biblios->find($biblionumber);
        $from_biblio->items->move_to_biblio($biblio);
        $from_biblio->article_requests->update({ biblionumber => $ref_biblionumber }, { no_triggers => 1 });
    }

    my $sth_subscription = $dbh->prepare("
        UPDATE subscription SET biblionumber = ? WHERE biblionumber = ?
    ");
    my $sth_subscriptionhistory = $dbh->prepare("
        UPDATE subscriptionhistory SET biblionumber = ? WHERE biblionumber = ?
    ");
    my $sth_serial = $dbh->prepare("
        UPDATE serial SET biblionumber = ? WHERE biblionumber = ?
    ");
    my $sth_suggestions = $dbh->prepare("
        UPDATE suggestions SET biblionumber = ? WHERE biblionumber = ?
    ");

    my $report_header = {};
    foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
        # build report

        push @report_records, \%report_record;
    }

    my $rmerge;
    eval {
        my $newbiblio = Koha::Biblios->find($ref_biblionumber);
        $rmerge = $newbiblio->merge_with( \@biblionumbers );
    };
    if ($@) {
        push @errors, $@;

    # Moving serials
    $sth_serial->execute($ref_biblionumber, $biblionumber);

    # Moving suggestions
    $sth_suggestions->execute($ref_biblionumber, $biblionumber);

    # Moving orders (orders linked to items of frombiblio have already been moved by move_to_biblio)
    my @allorders = GetOrdersByBiblionumber($biblionumber);
    foreach my $myorder (@allorders) {
        $myorder->{'biblionumber'} = $ref_biblionumber;
        ModOrder ($myorder);
    # TODO : add error control (in ModOrder?)
    }

    # Deleting the other records
    if (scalar(@errors) == 0) {
        # Move holds
        MergeHolds($dbh, $ref_biblionumber, $biblionumber);
        my $error = DelBiblio($biblionumber);
        push @errors, $error if ($error);
    }
}

    # Parameters
    $template->param(
        result           => 1,
        report_records   => \@report_records,
        report_header    => $report_header,
        ref_biblionumber => scalar $input->param('ref_biblionumber')
    );






use Modern::Perl;

use Test::More tests => 31;
use Test::Exception;
use Test::Warn;


    $schema->storage->txn_rollback;
};

subtest 'merge of records' => sub {
    plan tests => 1;
    $schema->storage->txn_begin;

    #Three biblio
    my $biblio1 = $builder->build_sample_biblio( { title => 'Title number 1' } );
    my $biblio2 = $builder->build_sample_biblio( { title => 'Title number 2' } );
    my $biblio3 = $builder->build_sample_biblio( { title => 'Title number 3' } );

    # One items each
    my $item1_1  = $builder->build_sample_item( { biblionumber => $biblio1->biblionumber, barcode => 'bar11' } );
    my $item2_1  = $builder->build_sample_item( { biblionumber => $biblio2->biblionumber, barcode => 'bar22' } );
    my $item3_1  = $builder->build_sample_item( { biblionumber => $biblio3->biblionumber, barcode => 'bar33' } );
    my $results  = '';
    my @to_merge = ( $biblio2->biblionumber, $biblio3->biblionumber );
    eval { $results = $biblio1->merge_with( \@to_merge ); };
    if ($@) {
        is( 0, 1, "Not working. Error: " . $@ );
    } else {
        my $items = $biblio1->items;
        is( $items->count, 3, "After merge we have 3 items on first record" );
    }

    #End work
    $schema->storage->txn_rollback;
};

subtest 'suggestions() tests' => sub {

    plan tests => 3;




use utf8;
use Encode;

use Test::More tests => 14;
use Test::MockModule;
use Test::Mojo;
use Test::Warn;


  $schema->storage->txn_rollback;
};

subtest 'merge() tests' => sub {
    plan tests => 12;
    $schema->storage->txn_begin;

    my $mij_rec = q|{
      "fields": [
        {
          "001": "2504398"
        },
        {
          "005": "20200421093816.0"
        },
        {
          "008": "920610s1993    caub         s001 0 eng  "
        },
        {
          "010": {
            "ind1": " ",
            "subfields": [
              {
                "a": "   92021731 "
              }
            ],
            "ind2": " "
          }
        },
        {
          "020": {
            "subfields": [
              {
                "a": "05200784462 (Test mij)"
              }
            ],
            "ind1": " ",
            "ind2": " "
          }
        },
        {
          "040": {
            "subfields": [
              {
                "a": "DLC"
              },
              {
                "c": "DLC"
              },
              {
                "d": "DLC"
              }
            ],
            "ind2": " ",
            "ind1": " "
          }
        },
        {
          "041": {
            "ind2": " ",
            "subfields": [
              {
                "a": "enggrc"
              }
            ],
            "ind1": "0"
          }
        },
        {
          "082": {
            "subfields": [
              {
                "a": "480"
              },
              {
                "2": "20"
              }
            ],
            "ind2": "0",
            "ind1": "0"
          }
        },
        {
          "100": {
            "ind2": " ",
            "subfields": [
              {
                "a": "Mastronarde, Donald J."
              },
              {
                "9": "389"
              }
            ],
            "ind1": "1"
          }
        },
        {
          "245": {
            "ind1": "1",
            "subfields": [
              {
                "a": "Introduction to Attic Greek  (Using mij) /"
              },
              {
                "c": "Donald J. Mastronarde."
              }
            ],
            "ind2": "0"
          }
        },
        {
          "260": {
            "subfields": [
              {
                "a": "Berkeley :"
              },
              {
                "b": "University of California Press,"
              },
              {
                "c": "c1993."
              }
            ],
            "ind2": " ",
            "ind1": " "
          }
        },
        {
          "300": {
            "ind1": " ",
            "subfields": [
              {
                "a": "ix, 425 p. :"
              },
              {
                "b": "maps ;"
              },
              {
                "c": "26 cm."
              }
            ],
            "ind2": " "
          }
        },
        {
          "650": {
            "subfields": [
              {
                "a": "Attic Greek dialect"
              },
              {
                "9": "7"
              }
            ],
            "ind2": "0",
            "ind1": " "
          }
        },
        {
          "942": {
            "subfields": [
              {
                "2": "ddc"
              },
              {
                "c": "BK"
              }
            ],
            "ind2": " ",
            "ind1": " "
          }
        },
        {
          "955": {
            "subfields": [
              {
                "a": "pc05 to ea00 06-11-92; ea04 to SCD 06-11-92; fd11 06-11-92 (PA522.M...); fr21 06-12-92; fs62 06-15-92; CIP ver. pv07 11-12-93"
              }
            ],
            "ind2": " ",
            "ind1": " "
          }
        },
        {
          "999": {
            "subfields": [
              {
                "c": "3"
              },
              {
                "d": "3"
              }
            ],
            "ind1": " ",
            "ind2": " "
          }
        }
      ],
      "leader": "01102pam a2200289 a 8500"
    }|;

    my $patron = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => { flags => 0 }
        }
    );
    my $password = 'thePassword123';
    $patron->set_password( { password => $password, skip_validation => 1 } );
    my $userid = $patron->userid;

    my $title_1     = 'Title number 1';
    my $title_2     = 'Title number 2';
    my $biblio1     = $builder->build_sample_biblio( { title => $title_1 } );
    my $biblio2     = $builder->build_sample_biblio( { title => $title_2 } );
    my $biblio_id1  = $biblio1->biblionumber;
    my $biblio_id2  = $biblio2->biblionumber;
    my $json_input1 = '{ "biblio_id_to_merge": "' . $biblio_id2 . '" }';

    $t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
            { 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input1 )
        ->status_is( 403, 'Not enough permissions to merge two bib records' );

    # Add permissions
    $patron->flags(516)->store;

    $t->post_ok(
        "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" => { 'Content-Type' => 'application/weird+format' } =>
            $json_input1 )->status_is( 400, 'Not correct headers' );

    my $result =
        $t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
            { 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input1 )
        ->status_is(200)->tx->res->body;
    like( $result, qr/$title_1/, "Merged record has the correct title" );
    unlike( $result, qr/$title_2/, "Merged record doesn't have the wrong title" );

    my $biblio3     = $builder->build_sample_biblio( { title => 'Title number 3' } );
    my $biblio_id3  = $biblio3->biblionumber;
    my $json_input2 = '{ "biblio_id_to_merge": "' . $biblio_id3 . '",
                         "rules": "override_ext",
                         "datarecord": ' . $mij_rec . ' }';
    $result =
        $t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
            { 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input2 )
        ->status_is(200)->tx->res->body;
    like( $result, qr/Using mij/, "Update with Marc-in-json record" );
    unlike( $result, qr/$title_1/, "Change all record with dat in the 'datarecord' field" );

    $schema->storage->txn_rollback;
    }

Return to bug 33036

Lines 35-40 use List::MoreUtils qw( any ); Link Here

(-)a/Koha/REST/V1/Biblios.pm (+84 lines)
35	use MARC::Record::MiJ;	35	use MARC::Record::MiJ;
36		36
37	use Try::Tiny qw( catch try );	37	use Try::Tiny qw( catch try );
		38	use JSON qw( decode_json );
38		39
39	=head1 API	40	=head1 API
40		41
Lines 892-895 sub list { Link Here
892	};	893	};
893	}	894	}
894		895
		896	=head3 merge
		897
		898	Controller function that handles merging two biblios. If an optional
		899	MARCXML is provided as the request body, this MARCXML replaces the
		900	bibliodata of the merge target biblio. Syntax format inside the request body
		901	must match with the Marc format used into Koha installation (MARC21 or UNIMARC)
		902
		903	=cut
		904
		905	sub merge {
		906	my $c = shift->openapi->valid_input or return;
		907	my $ref_biblionumber = $c->param('biblio_id');
		908	my $json = decode_json( $c->req->body );
		909	my $bn_merge = $json->{'biblio_id_to_merge'};
		910	my $framework = $json->{'framework_to_use'};
		911	my $rules = $json->{'rules'};
		912	my $override_rec = $json->{'datarecord'};
		913
		914	if ( ( !defined $rules ) \|\| ( $rules eq '' ) ) { $rules = 'override'; }
		915	if ( ( !defined $override_rec ) ) { $override_rec = ''; }
		916	if ( ( !defined $framework ) ) { $framework = ''; }
		917
		918	my $biblio = Koha::Biblios->find($ref_biblionumber);
		919	if ( not defined $biblio ) {
		920	return $c->render(
		921	status => 404,
		922	json => { error => sprintf( "[%s] biblio to merge into not found", $ref_biblionumber ) }
		923	);
		924	}
		925	my $frombib = Koha::Biblios->find($bn_merge);
		926	if ( not defined $frombib ) {
		927	return $c->render(
		928	status => 404,
		929	json => { error => sprintf( "[%s] from which to merge not found", $bn_merge ) }
		930	);
		931	}
		932
		933	if ( ( $rules eq 'override_ext' ) && ( $override_rec eq '' ) ) {
		934	return $c->render(
		935	status => 404,
		936	json => {
		937	error =>
		938	"With the rule 'override_ext' you need to insert a bib record in marc-in-json format into 'record' field."
		939	}
		940	);
		941	}
		942
		943	if ( ( $rules eq 'override' ) && ( $framework ne '' ) ) {
		944	return $c->render(
		945	status => 404,
		946	json => { error => "With the rule 'override' you can not use the field 'framework_to_use'." }
		947	);
		948	}
		949
		950	my $results;
		951	eval {
		952	if ( $rules eq 'override_ext' ) {
		953	my $record = MARC::Record::MiJ->new_from_mij_structure($override_rec);
		954	$record->encoding('UTF-8');
		955	if ( $framework eq '' ) { $framework = $biblio->frameworkcode; }
		956	my $chk = ModBiblio( $record, $ref_biblionumber, $framework );
		957	if ( $chk != 1 ) { die "Error on ModBiblio"; } # ModBiblio returns 1 if everything as gone well
		958	my @biblio_ids_to_merge = ($bn_merge);
		959	$results = $biblio->merge_with( \@biblio_ids_to_merge );
960	}
961	if ( $rules eq 'override' ) {
962	my @biblio_ids_to_merge = ($bn_merge);
963	$results = $biblio->merge_with( \@biblio_ids_to_merge );
964	}
965	};
966	if ($@) {
967	return $c->render( status => 400, json => { error => $@ } );
968	} else {
969	$c->respond_to(
970	mij => {
971	status => 200,
972	format => 'mij',
973	data => $biblio->metadata->record->to_mij
974	}
975	);
976	}
977	}
978
895	1;	979	1;

Line 0 Link Here

(-)a/api/v1/swagger/definitions/merge_biblios.yaml (+28 lines)
	1	---
	2	type: object
	3	properties:
	4	biblio_id_to_merge:
	5	type: integer
	6	description: Biblionumber from which to merge
	7	rules:
	8	type:
	9	- string
	10	- "null"
	11	description: Internally identifier of a merge algoritm. Now two identifier are supported, 'override' and 'override_ext'.
	12	'override' is to use when you the bibliographic data of biblio_id as resulting bibliographic data. The null value is equivalent
	13	of 'override'.
	14	'override_ext' is to use only with a value in datarecord field. In fact is mandatory to use if you insert a record inside datarecord field.
	15	framework_to_use:
	16	type:
	17	- string
	18	- "null"
	19	description: Framework code, you can use it only with a value in datarecord field. With null value it uses the framework
	20	code of record to be merged into.
	21	datarecord:
	22	description: Bibliographic record used as result of the merge. It uses the format MARC-in-JSON
	23	type:
	24	- object
	25	- "null"
	26	additionalProperties: false
	27	required:
	28	- biblio_id_to_merge

Line 0 Link Here

(-)a/api/v1/swagger/paths/biblios_merge.yaml (+49 lines)
	1	"/biblios/{biblio_id}/merge":
	2	post:
	3	x-mojo-to: Biblios#merge
	4	operationId: mergeBiblios
	5	tags:
	6	- merge_biblios
	7	summary: Merge Biblios
	8	parameters:
	9	- name: biblio_id
	10	in: path
	11	description: Bilblionumber
	12	required: true
	13	type: string
	14	- name: body
	15	in: body
	16	required: true
	17	description: JSON Object with params and an optional marc record in MARC-in-JSON format
	18	schema:
	19	$ref: "../swagger.yaml#/definitions/merge_biblios"
	20	consumes:
	21	- application/json
	22	produces:
	23	- application/marc-in-json
	24	responses:
	25	'200':
	26	description: The merge result as a biblio record
	27	'404':
	28	description: Biblio not found
	29	schema:
	30	"$ref": "../swagger.yaml#/definitions/error"
	31	'401':
	32	description: Authentication required
	33	schema:
	34	"$ref": "../swagger.yaml#/definitions/error"
	35	'403':
	36	description: Access forbidden
	37	schema:
	38	"$ref": "../swagger.yaml#/definitions/error"
	39	'500':
	40	description: Internal server error
	41	schema:
	42	"$ref": "../swagger.yaml#/definitions/error"
	43	'503':
	44	description: Under maintenance
	45	schema:
	46	"$ref": "../swagger.yaml#/definitions/error"
	47	x-koha-authorization:
	48	permissions:
	49	catalogue: "editcatalogue"

Lines 86-118 if ($merge) { Link Here

(-)a/cataloguing/merge.pl (-54 / +11 lines)
86	# Rewriting the leader	86	# Rewriting the leader
87	my $biblio = Koha::Biblios->find($ref_biblionumber);	87	my $biblio = Koha::Biblios->find($ref_biblionumber);
88	$record->leader($biblio->metadata->record->leader());	88	$record->leader($biblio->metadata->record->leader());
89		89	#Take new framework code
90	my $frameworkcode = $input->param('frameworkcode');	90	my $frameworkcode = $input->param('frameworkcode');
91		91
92	# Modifying the reference record	92	# Modifying the reference record
93	ModBiblio($record, $ref_biblionumber, $frameworkcode);	93	ModBiblio($record, $ref_biblionumber, $frameworkcode);
94		94
95	# Moving items and article requests from the other record to the reference record
96	$biblio = $biblio->get_from_storage;
97	foreach my $biblionumber (@biblionumbers) {
98	my $from_biblio = Koha::Biblios->find($biblionumber);
99	$from_biblio->items->move_to_biblio($biblio);
100	$from_biblio->article_requests->update({ biblionumber => $ref_biblionumber }, { no_triggers => 1 });
101	}
102
103	my $sth_subscription = $dbh->prepare("
104	UPDATE subscription SET biblionumber = ? WHERE biblionumber = ?
105	");
106	my $sth_subscriptionhistory = $dbh->prepare("
107	UPDATE subscriptionhistory SET biblionumber = ? WHERE biblionumber = ?
108	");
109	my $sth_serial = $dbh->prepare("
110	UPDATE serial SET biblionumber = ? WHERE biblionumber = ?
111	");
112	my $sth_suggestions = $dbh->prepare("
113	UPDATE suggestions SET biblionumber = ? WHERE biblionumber = ?
114	");
115
116	my $report_header = {};	95	my $report_header = {};
117	foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {	96	foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
118	# build report	97	# build report
Lines 148-189 if ($merge) { Link Here
148	push @report_records, \%report_record;	127	push @report_records, \%report_record;
149	}	128	}
150		129
151	foreach my $biblionumber (@biblionumbers) {	130	my $rmerge;
152	# Moving subscriptions from the other record to the reference record	131	eval {
153	my $subcount = CountSubscriptionFromBiblionumber($biblionumber);	132	my $newbiblio = Koha::Biblios->find($ref_biblionumber);
154	if ($subcount > 0) {	133	$rmerge = $newbiblio->merge_with( \@biblionumbers );
155	$sth_subscription->execute($ref_biblionumber, $biblionumber);	134	};
156	$sth_subscriptionhistory->execute($ref_biblionumber, $biblionumber);	135	if ($@) {
157	}	136	push @errors, $@;
158
159	# Moving serials
160	$sth_serial->execute($ref_biblionumber, $biblionumber);
161
162	# Moving suggestions
163	$sth_suggestions->execute($ref_biblionumber, $biblionumber);
164
165	# Moving orders (orders linked to items of frombiblio have already been moved by move_to_biblio)
166	my @allorders = GetOrdersByBiblionumber($biblionumber);
167	foreach my $myorder (@allorders) {
168	$myorder->{'biblionumber'} = $ref_biblionumber;
169	ModOrder ($myorder);
170	# TODO : add error control (in ModOrder?)
171	}	137	}
172		138
173	# Deleting the other records
174	if (scalar(@errors) == 0) {
175	# Move holds
176	MergeHolds($dbh, $ref_biblionumber, $biblionumber);
177	my $error = DelBiblio($biblionumber);
178	push @errors, $error if ($error);
179	}
180	}
181
182	# Parameters	139	# Parameters
183	$template->param(	140	$template->param(
184	result => 1,	141	result => 1,
185	report_records => \@report_records,	142	report_records => \@report_records,
186	report_header => $report_header,	143	report_header => $report_header,
187	ref_biblionumber => scalar $input->param('ref_biblionumber')	144	ref_biblionumber => scalar $input->param('ref_biblionumber')
188	);	145	);
189		146

Lines 17-23 Link Here

(-)a/t/db_dependent/Koha/Biblio.t (-1 / +28 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 30;	20	use Test::More tests => 31;
21	use Test::Exception;	21	use Test::Exception;
22	use Test::Warn;	22	use Test::Warn;
23		23
Lines 486-491 subtest 'to_api() tests' => sub { Link Here
486	$schema->storage->txn_rollback;	486	$schema->storage->txn_rollback;
487	};	487	};
488		488
		489	subtest 'merge of records' => sub {
		490	plan tests => 1;
		491	$schema->storage->txn_begin;
		492
		493	#Three biblio
		494	my $biblio1 = $builder->build_sample_biblio( { title => 'Title number 1' } );
		495	my $biblio2 = $builder->build_sample_biblio( { title => 'Title number 2' } );
		496	my $biblio3 = $builder->build_sample_biblio( { title => 'Title number 3' } );
		497
		498	# One items each
		499	my $item1_1 = $builder->build_sample_item( { biblionumber => $biblio1->biblionumber, barcode => 'bar11' } );
		500	my $item2_1 = $builder->build_sample_item( { biblionumber => $biblio2->biblionumber, barcode => 'bar22' } );
		501	my $item3_1 = $builder->build_sample_item( { biblionumber => $biblio3->biblionumber, barcode => 'bar33' } );
		502	my $results = '';
		503	my @to_merge = ( $biblio2->biblionumber, $biblio3->biblionumber );
		504	eval { $results = $biblio1->merge_with( \@to_merge ); };
		505	if ($@) {
		506	is( 0, 1, "Not working. Error: " . $@ );
		507	} else {
		508	my $items = $biblio1->items;
		509	is( $items->count, 3, "After merge we have 3 items on first record" );
		510	}
		511
		512	#End work
		513	$schema->storage->txn_rollback;
		514	};
		515
489	subtest 'suggestions() tests' => sub {	516	subtest 'suggestions() tests' => sub {
490		517
491	plan tests => 3;	518	plan tests => 3;

Lines 20-26 use Modern::Perl; Link Here

(-)a/t/db_dependent/api/v1/biblios.t (-2 / +250 lines)
20	use utf8;	20	use utf8;
21	use Encode;	21	use Encode;
22		22
23	use Test::More tests => 13;	23	use Test::More tests => 14;
24	use Test::MockModule;	24	use Test::MockModule;
25	use Test::Mojo;	25	use Test::Mojo;
26	use Test::Warn;	26	use Test::Warn;
Lines 1811-1813 subtest 'update_item() tests' => sub { Link Here
1811		1811
1812	$schema->storage->txn_rollback;	1812	$schema->storage->txn_rollback;
1813	};	1813	};
1814	-	1814
		1815	subtest 'merge() tests' => sub {
		1816	plan tests => 12;
		1817	$schema->storage->txn_begin;
		1818
		1819	my $mij_rec = q\|{
		1820	"fields": [
		1821	{
		1822	"001": "2504398"
		1823	},
		1824	{
		1825	"005": "20200421093816.0"
		1826	},
		1827	{
		1828	"008": "920610s1993 caub s001 0 eng "
		1829	},
		1830	{
		1831	"010": {
		1832	"ind1": " ",
		1833	"subfields": [
		1834	{
		1835	"a": " 92021731 "
		1836	}
		1837	],
		1838	"ind2": " "
		1839	}
		1840	},
		1841	{
		1842	"020": {
		1843	"subfields": [
		1844	{
		1845	"a": "05200784462 (Test mij)"
		1846	}
		1847	],
		1848	"ind1": " ",
		1849	"ind2": " "
		1850	}
		1851	},
		1852	{
		1853	"040": {
		1854	"subfields": [
		1855	{
		1856	"a": "DLC"
		1857	},
		1858	{
		1859	"c": "DLC"
		1860	},
		1861	{
		1862	"d": "DLC"
		1863	}
		1864	],
		1865	"ind2": " ",
		1866	"ind1": " "
		1867	}
		1868	},
		1869	{
		1870	"041": {
		1871	"ind2": " ",
		1872	"subfields": [
		1873	{
		1874	"a": "enggrc"
		1875	}
		1876	],
		1877	"ind1": "0"
		1878	}
1879	},
1880	{
1881	"082": {
1882	"subfields": [
1883	{
1884	"a": "480"
1885	},
1886	{
1887	"2": "20"
1888	}
1889	],
1890	"ind2": "0",
1891	"ind1": "0"
1892	}
1893	},
1894	{
1895	"100": {
1896	"ind2": " ",
1897	"subfields": [
1898	{
1899	"a": "Mastronarde, Donald J."
1900	},
1901	{
1902	"9": "389"
1903	}
1904	],
1905	"ind1": "1"
1906	}
1907	},
1908	{
1909	"245": {
1910	"ind1": "1",
1911	"subfields": [
1912	{
1913	"a": "Introduction to Attic Greek (Using mij) /"
1914	},
1915	{
1916	"c": "Donald J. Mastronarde."
1917	}
1918	],
1919	"ind2": "0"
1920	}
1921	},
1922	{
1923	"260": {
1924	"subfields": [
1925	{
1926	"a": "Berkeley :"
1927	},
1928	{
1929	"b": "University of California Press,"
1930	},
1931	{
1932	"c": "c1993."
1933	}
1934	],
1935	"ind2": " ",
1936	"ind1": " "
1937	}
1938	},
1939	{
1940	"300": {
1941	"ind1": " ",
1942	"subfields": [
1943	{
1944	"a": "ix, 425 p. :"
1945	},
1946	{
1947	"b": "maps ;"
1948	},
1949	{
1950	"c": "26 cm."
1951	}
1952	],
1953	"ind2": " "
1954	}
1955	},
1956	{
1957	"650": {
1958	"subfields": [
1959	{
1960	"a": "Attic Greek dialect"
1961	},
1962	{
1963	"9": "7"
1964	}
1965	],
1966	"ind2": "0",
1967	"ind1": " "
1968	}
1969	},
1970	{
1971	"942": {
1972	"subfields": [
1973	{
1974	"2": "ddc"
1975	},
1976	{
1977	"c": "BK"
1978	}
1979	],
1980	"ind2": " ",
1981	"ind1": " "
1982	}
1983	},
1984	{
1985	"955": {
1986	"subfields": [
1987	{
1988	"a": "pc05 to ea00 06-11-92; ea04 to SCD 06-11-92; fd11 06-11-92 (PA522.M...); fr21 06-12-92; fs62 06-15-92; CIP ver. pv07 11-12-93"
1989	}
1990	],
1991	"ind2": " ",
1992	"ind1": " "
1993	}
1994	},
1995	{
1996	"999": {
1997	"subfields": [
1998	{
1999	"c": "3"
2000	},
2001	{
2002	"d": "3"
2003	}
2004	],
2005	"ind1": " ",
2006	"ind2": " "
2007	}
2008	}
2009	],
2010	"leader": "01102pam a2200289 a 8500"
2011	}\|;
2012
2013	my $patron = $builder->build_object(
2014	{
2015	class => 'Koha::Patrons',
2016	value => { flags => 0 }
2017	}
2018	);
2019	my $password = 'thePassword123';
2020	$patron->set_password( { password => $password, skip_validation => 1 } );
2021	my $userid = $patron->userid;
2022
2023	my $title_1 = 'Title number 1';
2024	my $title_2 = 'Title number 2';
2025	my $biblio1 = $builder->build_sample_biblio( { title => $title_1 } );
2026	my $biblio2 = $builder->build_sample_biblio( { title => $title_2 } );
2027	my $biblio_id1 = $biblio1->biblionumber;
2028	my $biblio_id2 = $biblio2->biblionumber;
2029	my $json_input1 = '{ "biblio_id_to_merge": "' . $biblio_id2 . '" }';
2030
2031	$t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
2032	{ 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input1 )
2033	->status_is( 403, 'Not enough permissions to merge two bib records' );
2034
2035	# Add permissions
2036	$patron->flags(516)->store;
2037
2038	$t->post_ok(
2039	"//$userid:$password@/api/v1/biblios/$biblio_id1/merge" => { 'Content-Type' => 'application/weird+format' } =>
2040	$json_input1 )->status_is( 400, 'Not correct headers' );
2041
2042	my $result =
2043	$t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
2044	{ 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input1 )
2045	->status_is(200)->tx->res->body;
2046	like( $result, qr/$title_1/, "Merged record has the correct title" );
2047	unlike( $result, qr/$title_2/, "Merged record doesn't have the wrong title" );
2048
2049	my $biblio3 = $builder->build_sample_biblio( { title => 'Title number 3' } );
2050	my $biblio_id3 = $biblio3->biblionumber;
2051	my $json_input2 = '{ "biblio_id_to_merge": "' . $biblio_id3 . '",
2052	"rules": "override_ext",
2053	"datarecord": ' . $mij_rec . ' }';
2054	$result =
2055	$t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id1/merge" =>
2056	{ 'Content-Type' => 'application/json', 'Accept' => 'application/marc-in-json' } => $json_input2 )
2057	->status_is(200)->tx->res->body;
2058	like( $result, qr/Using mij/, "Update with Marc-in-json record" );
2059	unlike( $result, qr/$title_1/, "Change all record with dat in the 'datarecord' field" );
2060
2061	$schema->storage->txn_rollback;
2062	}