[DSC-747] add MetadataFilter interface

Author: atarix83

src/app/core/data/bitstream-data.service.ts

@@ -30,6 +30,11 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { PageInfo } from '../shared/page-info.model';
 import { RequestParam } from '../cache/models/request-param.model';
 
+export interface MetadataFilter {
+  metadataName: string;
+  metadataValue: string;
+}
+
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
  */
@@ -191,7 +196,8 @@ export class BitstreamDataService extends DataService<Bitstream> {
    *
    * @param uuid                        The item UUID to retrieve bitstreams from
    * @param bundlename                  Bundle type of the bitstreams
-   * @param metadataFilter              Array of object we want to filter by
+   * @param metadataFilters             Array of object we want to filter by
+   * @param options                     The {@link FindListOptions} for the request
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
@@ -202,7 +208,7 @@ export class BitstreamDataService extends DataService<Bitstream> {
   findByItem(
     uuid: string,
     bundlename: string,
-    metadataFilter: any,
+    metadataFilters: MetadataFilter[],
     options: FindListOptions,
     useCachedVersionIfAvailable = true,
     reRequestOnStale = true,
@@ -212,10 +218,9 @@ export class BitstreamDataService extends DataService<Bitstream> {
     searchParams.push(new RequestParam('uuid', uuid));
     searchParams.push(new RequestParam('name', bundlename));
 
-
-    Object.keys(metadataFilter).forEach(key => {
-      searchParams.push(new RequestParam('filterMetadata', key));
-      searchParams.push(new RequestParam('filterMetadataValue', metadataFilter[key]));
+    metadataFilters.forEach((entry: MetadataFilter) => {
+      searchParams.push(new RequestParam('filterMetadata', entry.metadataName));
+      searchParams.push(new RequestParam('filterMetadataValue', entry.metadataValue));
     });
 
     const hrefObs = this.getSearchByHref(

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts

@@ -6,9 +6,9 @@ import { map } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { Bitstream } from '../../../../../../core/shared/bitstream.model';
-import { hasValue, isEmpty } from '../../../../../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../../../../../shared/empty.util';
 import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
-import { BitstreamDataService } from '../../../../../../core/data/bitstream-data.service';
+import { BitstreamDataService, MetadataFilter } from '../../../../../../core/data/bitstream-data.service';
 import { Item } from '../../../../../../core/shared/item.model';
 import { LayoutField } from '../../../../../../core/layout/models/box.model';
 import { RenderingTypeStructuredModelComponent } from './rendering-type-structured.model';
@@ -116,13 +116,16 @@ export abstract class BitstreamRenderingModelComponent extends RenderingTypeStru
    * @param options The {@link FindListOptions} for the request
    */
   getBitstreamsByItem(options?: FindListOptions): Observable<PaginatedList<Bitstream>> {
-    let filter = {};
-    if (!isEmpty(this.field.bitstream.metadataValue)) {
-      filter = { [this.field.bitstream.metadataField]: this.field.bitstream.metadataValue };
+    let filters: MetadataFilter[] = [];
+    if (isNotEmpty(this.field.bitstream.metadataValue)) {
+      filters.push({
+        metadataName: this.field.bitstream.metadataField,
+        metadataValue: this.field.bitstream.metadataValue
+      });
     }
 
     return this.bitstreamDataService
-      .findByItem(this.item.uuid, this.field.bitstream.bundle, filter, options, false, false, followLink('thumbnail'))
+      .findByItem(this.item.uuid, this.field.bitstream.bundle, filters, options, false, false, followLink('thumbnail'))
       .pipe(
         getFirstCompletedRemoteData(),
         map((response: RemoteData<PaginatedList<Bitstream>>) => {