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

(-)a/Koha/Object.pm (-13 / +45 lines)
Lines 380-404 Returns a representation of the object, suitable for API output. Link Here
380
=cut
380
=cut
381
381
382
sub to_api {
382
sub to_api {
383
    my ( $self ) = @_;
383
    my ( $self, $embeds ) = @_;
384
    my $json_object = $self->TO_JSON;
384
    my $json_object = $self->TO_JSON;
385
385
386
    my $to_api_mapping = $self->to_api_mapping;
386
    my $to_api_mapping = $self->to_api_mapping;
387
387
388
    # Rename attributes if there's a mapping
388
    # Rename attributes if there's a mapping
389
    foreach my $column ( keys %{$to_api_mapping} ) {
389
    if ( $self->can('to_api_mapping') ) {
390
        my $mapped_column = $to_api_mapping->{$column};
390
        foreach my $column ( keys %{ $self->to_api_mapping } ) {
391
        if ( exists $json_object->{$column}
391
            my $mapped_column = $self->to_api_mapping->{$column};
392
            && defined $mapped_column )
392
            if ( exists $json_object->{$column}
393
        {
393
                && defined $mapped_column )
394
            # key != undef
394
            {
395
            $json_object->{$mapped_column} = delete $json_object->{$column};
395
                # key != undef
396
                $json_object->{$mapped_column} = delete $json_object->{$column};
397
            }
398
            elsif ( exists $json_object->{$column}
399
                && !defined $mapped_column )
400
            {
401
                # key == undef
402
                delete $json_object->{$column};
403
            }
396
        }
404
        }
397
        elsif ( exists $json_object->{$column}
405
    }
398
            && !defined $mapped_column )
406
399
        {
407
    if ($embeds) {
400
            # key == undef
408
        foreach my $embed (@$embeds) {
401
            delete $json_object->{$column};
409
            my ( $curr, $next ) = split /\s*\.\s*/, $embed, 2;
410
            my @nxembeds;
411
412
            @nxembeds = ($next) if $next;
413
414
            my $children = $self->$curr;
415
            if ( ref $children eq 'ARRAY' ) {
416
                my @list;
417
                my $pos = 0;
418
                foreach my $child (@$children) {
419
                    my $res = $child->to_api( \@nxembeds );
420
                    $res = { $json_object->{$curr}->[$pos], $res }
421
                      if defined $json_object->{$curr}
422
                      && defined $json_object->{$curr}->[$pos];
423
                    push @list, $res;
424
                    $pos++;
425
                }
426
                $json_object->{$curr} = \@list;
427
            }
428
            else {
429
                my $res = $children->to_api( \@nxembeds );
430
                $res = { $json_object->{$curr}, $res }
431
                  if defined $json_object->{$curr};
432
                $json_object->{$curr} = $res;
433
            }
402
        }
434
        }
403
    }
435
    }
404
436
(-)a/Koha/Objects.pm (-2 / +2 lines)
Lines 315-323 Returns a representation of the objects, suitable for API output . Link Here
315
=cut
315
=cut
316
316
317
sub to_api {
317
sub to_api {
318
    my ($self) = @_;
318
    my ($self, $embeds) = @_;
319
319
320
    return [ map { $_->to_api } $self->as_list ];
320
    return [ map { $_->to_api($embeds) } $self->as_list ];
321
}
321
}
322
322
323
=head3 Koha::Objects->_wrap
323
=head3 Koha::Objects->_wrap
(-)a/t/db_dependent/Koha/Object.t (-2 / +39 lines)
Lines 215-221 subtest 'TO_JSON tests' => sub { Link Here
215
215
216
subtest "to_api() tests" => sub {
216
subtest "to_api() tests" => sub {
217
217
218
    plan tests => 11;
218
    plan tests => 18;
219
219
220
    $schema->storage->txn_begin;
220
    $schema->storage->txn_begin;
221
221
Lines 262-267 subtest "to_api() tests" => sub { Link Here
262
    my $illrequest = $builder->build_object({ class => 'Koha::Illrequests' });
262
    my $illrequest = $builder->build_object({ class => 'Koha::Illrequests' });
263
    is_deeply( $illrequest->to_api, $illrequest->TO_JSON, 'If no overloaded to_api_mapping method, return TO_JSON' );
263
    is_deeply( $illrequest->to_api, $illrequest->TO_JSON, 'If no overloaded to_api_mapping method, return TO_JSON' );
264
264
265
    my $item_class = Test::MockModule->new('Koha::Item');
266
    $item_class->mock( 'to_api_mapping',
267
        sub {
268
            return {
269
                itemnumber       => 'item_id'
270
            };
271
        }
272
    );
273
274
    my $hold_class = Test::MockModule->new('Koha::Hold');
275
    $hold_class->mock( 'to_api_mapping',
276
        sub {
277
            return {
278
                reserve_id       => 'hold_id'
279
            };
280
        }
281
    );
282
283
    my $biblio = $builder->build_sample_biblio();
284
    my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber });
285
    my $hold = $builder->build_object({ class => 'Koha::Holds', value => { itemnumber => $item->itemnumber } });
286
287
    my @embeds = ('items');
288
289
    my $biblio_api = $biblio->to_api(\@embeds);
290
291
    ok(exists $biblio_api->{items}, 'Items where embedded in biblio results');
292
    is($biblio_api->{items}->[0]->{item_id}, $item->itemnumber, 'Item matches');
293
    ok(!exists $biblio_api->{items}->[0]->{holds}, 'No holds info should be embedded yet');
294
295
    @embeds = ('items.holds');
296
    $biblio_api = $biblio->to_api(\@embeds);
297
298
    ok(exists $biblio_api->{items}, 'Items where embedded in biblio results');
299
    is($biblio_api->{items}->[0]->{item_id}, $item->itemnumber, 'Item still matches');
300
    ok(exists $biblio_api->{items}->[0]->{holds}, 'Holds info should be embedded');
301
    is($biblio_api->{items}->[0]->{holds}->[0]->{hold_id}, $hold->reserve_id, 'Hold matches');
302
265
    $schema->storage->txn_rollback;
303
    $schema->storage->txn_rollback;
266
};
304
};
267
305
268
- 

Return to bug 24228