[DURACOM-413] add new findByIdOrCustomUrl method to item-data.service, adapt code to use new method

Author: FrancescoMolinaro

src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts

@@ -7,6 +7,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { ItemDataService } from '../data/item-data.service';
 import { getDSORoute } from '../router/utils/dso-route.utils';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { FollowLinkConfig } from '../shared/follow-link-config.model';
@@ -55,7 +56,9 @@ export const DSOBreadcrumbResolverByUuid: (route: ActivatedRouteSnapshot, state:
   dataService: IdentifiableDataService<DSpaceObject>,
   ...linksToFollow: FollowLinkConfig<DSpaceObject>[]
 ): Observable<BreadcrumbConfig<DSpaceObject>> => {
-  return dataService.findById(uuid, true, false, ...linksToFollow).pipe(
+  const isItemDataService = dataService instanceof ItemDataService;
+  const findMethod = isItemDataService ? dataService.findByIdOrCustomUrl.bind(dataService) : dataService.findById.bind(dataService);
+  return findMethod(uuid, true, false, ...linksToFollow).pipe(
     getFirstCompletedRemoteData(),
     getRemoteDataPayload(),
     map((object: DSpaceObject) => {

src/app/core/data/item-data.service.spec.ts

@@ -292,7 +292,7 @@ describe('ItemDataService', () => {
 
     it('should call findByCustomUrl when given a non-UUID id', () => {
       const nonUuid = 'custom-url';
-      itemDataService.findById(nonUuid).subscribe();
+      itemDataService.findByIdOrCustomUrl(nonUuid).subscribe();
 
       expect(itemDataService.findByCustomUrl).toHaveBeenCalledWith(nonUuid, true, true, []);
       expect(itemDataService.findByHref).not.toHaveBeenCalled();

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

@@ -472,17 +472,33 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    *                                    {@link HALLink}s should be automatically resolved
    */
   public findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Item>[]): Observable<RemoteData<Item>> {
+    const href$ = this.getIDHrefObs(encodeURIComponent(id), ...linksToFollow);
+    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 
+  /**
+   * Returns an observable of {@link RemoteData} of an object, based on its ID or custom URL if the parameter is not a valid id/uuid, with a list of
+   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
+   * @param id                          ID of object we want to retrieve
+   * @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-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  public findByIdOrCustomUrl(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Item>[]): Observable<RemoteData<Item>> {
     if (uuidValidate(id)) {
-      const href$ = this.getIDHrefObs(encodeURIComponent(id), ...linksToFollow);
-      return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+      return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
     } else {
       return this.findByCustomUrl(id, useCachedVersionIfAvailable, reRequestOnStale, linksToFollow);
     }
   }
 
 }
 
+
+
 /**
  * A service for CRUD operations on Items
  */

src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts

@@ -61,7 +61,7 @@ describe('itemPageDeleteGuard', () => {
     item = new Item();
     item.uuid = uuid;
     item._links = { self: { href: itemSelfLink }  } as any;
-    itemService = jasmine.createSpyObj('itemService', { findById: createSuccessfulRemoteDataObject$(item) });
+    itemService = jasmine.createSpyObj('itemService', { findByIdOrCustomUrl: createSuccessfulRemoteDataObject$(item) });
 
     TestBed.configureTestingModule({
       providers: [

src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts

@@ -61,7 +61,7 @@ describe('itemPageEditAuthorizationsGuard', () => {
     item = new Item();
     item.uuid = uuid;
     item._links = { self: { href: itemSelfLink }  } as any;
-    itemService = jasmine.createSpyObj('itemService', { findById: createSuccessfulRemoteDataObject$(item) });
+    itemService = jasmine.createSpyObj('itemService', { findByIdOrCustomUrl: createSuccessfulRemoteDataObject$(item) });
 
     TestBed.configureTestingModule({
       providers: [

src/app/item-page/edit-item-page/item-page-move.guard.spec.ts

@@ -61,7 +61,7 @@ describe('itemPageMoveGuard', () => {
     item = new Item();
     item.uuid = uuid;
     item._links = { self: { href: itemSelfLink }  } as any;
-    itemService = jasmine.createSpyObj('itemService', { findById: createSuccessfulRemoteDataObject$(item) });
+    itemService = jasmine.createSpyObj('itemService', { findByIdOrCustomUrl: createSuccessfulRemoteDataObject$(item) });
 
     TestBed.configureTestingModule({
       providers: [

src/app/item-page/edit-item-page/item-page-private.guard.spec.ts

@@ -61,7 +61,7 @@ describe('itemPagePrivateGuard', () => {
     item = new Item();
     item.uuid = uuid;
     item._links = { self: { href: itemSelfLink }  } as any;
-    itemService = jasmine.createSpyObj('itemService', { findById: createSuccessfulRemoteDataObject$(item) });
+    itemService = jasmine.createSpyObj('itemService', { findByIdOrCustomUrl: createSuccessfulRemoteDataObject$(item) });
 
     TestBed.configureTestingModule({
       providers: [

src/app/item-page/item-page.resolver.spec.ts

@@ -41,7 +41,7 @@ describe('itemPageResolver', () => {
           },
         });
         itemService = {
-          findById: (_id: string) => createSuccessfulRemoteDataObject$(item),
+          findByIdOrCustomUrl: (_id: string) => createSuccessfulRemoteDataObject$(item),
         };
         store = jasmine.createSpyObj('store', {
           dispatch: {},
@@ -130,7 +130,7 @@ describe('itemPageResolver', () => {
         },
       });
       itemService = {
-        findById: (_id: string) => createSuccessfulRemoteDataObject$(item),
+        findByIdOrCustomUrl: (_id: string) => createSuccessfulRemoteDataObject$(item),
       };
       store = jasmine.createSpyObj('store', {
         dispatch: {},

src/app/item-page/item-page.resolver.ts

@@ -42,7 +42,7 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   store: Store<AppState> = inject(Store<AppState>),
   authService: AuthService = inject(AuthService),
 ): Observable<RemoteData<Item>> => {
-  const itemRD$ = itemService.findById(
+  const itemRD$ = itemService.findByIdOrCustomUrl(
     route.params.id,
     true,
     false,

src/app/item-page/item.resolver.ts

@@ -23,7 +23,7 @@ export const itemResolver: ResolveFn<RemoteData<Item>> = (
   itemService: ItemDataService = inject(ItemDataService),
   store: Store<AppState> = inject(Store<AppState>),
 ): Observable<RemoteData<Item>> => {
-  const itemRD$ = itemService.findById(
+  const itemRD$ = itemService.findByIdOrCustomUrl(
     route.params.id,
     true,
     false,