[CST-5674] add test case for updateTarget

src/app/core/resource-policy/resource-policy.service.spec.ts

@@ -92,6 +92,8 @@ describe('ResourcePolicyService', () => {
   const resourcePolicyRD = createSuccessfulRemoteDataObject(resourcePolicy);
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
 
+  const ePersonEndpoint = 'EPERSON_EP';
+
   beforeEach(() => {
     scheduler = getTestScheduler();
 
@@ -109,6 +111,7 @@ describe('ResourcePolicyService', () => {
       removeByHrefSubstring: {},
       getByHref: observableOf(responseCacheEntry),
       getByUUID: observableOf(responseCacheEntry),
+      setStaleByHrefSubstring: {},
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
@@ -121,6 +124,16 @@ describe('ResourcePolicyService', () => {
         a: resourcePolicyRD
       })
     });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      getBrowseEndpoint: hot('a', {
+        a: ePersonEndpoint
+      }),
+    });
+    /*groupService = jasmine.createSpyObj('groupService', {
+      getBrowseEndpoint: cold('a|', {
+        a: groupEndpoint
+      }),
+    });*/
     objectCache = {} as ObjectCacheService;
     const notificationsService = {} as NotificationsService;
     const http = {} as HttpClient;
@@ -326,4 +339,20 @@ describe('ResourcePolicyService', () => {
       expect(result).toBeObservable(expected);
     });
   });
+
+  describe('updateTarget', () => {
+    it('should create a new PUT request for eperson', () => {
+      const resourcePolicyId = 'RESOURCE_POLICY_ID';
+      const resourcePolicyHref = 'RESOURCE_POLICY_HREF';
+      const targetUUID = 'TARGET_UUID';
+      const targetType = 'eperson';
+
+      const result = service.updateTarget(resourcePolicyId, resourcePolicyHref, targetUUID, targetType);
+      const expected = cold('a|', {
+        a: resourcePolicyRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
 });

src/app/core/resource-policy/resource-policy.service.ts

@@ -23,7 +23,7 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { map, switchMap, take } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { CoreState } from '../core-state.model';
@@ -71,7 +71,7 @@ export class ResourcePolicyService {
   protected searchByResourceMethod = 'resource';
 
   constructor(
-    protected requestService: RequestService,
+    public requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
@@ -237,16 +237,16 @@ export class ResourcePolicyService {
    * Update the target of the resource policy
    * @param resourcePolicyId the ID of the resource policy
    * @param resourcePolicyHref the link to the resource policy
-   * @param uuid the UUID of the target to which the permission is being granted
+   * @param targetUUID the UUID of the target to which the permission is being granted
-   * @param type the type of the target (eperson or group) to which the permission is being granted
+   * @param targetType the type of the target (eperson or group) to which the permission is being granted
    */
-  updateTarget(resourcePolicyId: string, resourcePolicyHref: string, uuid: string, type: string): Observable<RemoteData<any>> {
+  updateTarget(resourcePolicyId: string, resourcePolicyHref: string, targetUUID: string, targetType: string): Observable<RemoteData<any>> {
 
-    const targetService = type === 'eperson' ? this.ePersonService : this.groupService;
+    const targetService = targetType === 'eperson' ? this.ePersonService : this.groupService;
 
     const targetEndpoint$ = targetService.getBrowseEndpoint().pipe(
       take(1),
-      map((endpoint: string) =>`${endpoint}/${uuid}`),
+      map((endpoint: string) =>`${endpoint}/${targetUUID}`),
     );
 
     const options: HttpOptions = Object.create({});
@@ -256,10 +256,10 @@ export class ResourcePolicyService {
 
     const requestId = this.requestService.generateRequestId();
 
-    this.requestService.setStaleByHrefSubstring(`${this.dataService.getLinkPath()}/${resourcePolicyId}/${type}`);
+    this.requestService.setStaleByHrefSubstring(`${this.dataService.getLinkPath()}/${resourcePolicyId}/${targetType}`);
 
-    return targetEndpoint$.pipe(switchMap((targetEndpoint) => {
+    targetEndpoint$.subscribe((targetEndpoint) => {
-      const resourceEndpoint = resourcePolicyHref + '/' + type;
+      const resourceEndpoint = resourcePolicyHref + '/' + targetType;
       const request = new PutRequest(requestId, resourceEndpoint, targetEndpoint, options);
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
@@ -267,8 +267,9 @@ export class ResourcePolicyService {
         }
       });
       this.requestService.send(request);
-      return this.rdbService.buildFromRequestUUID(requestId);
+    });
-    }));
+
+    return this.rdbService.buildFromRequestUUID(requestId);
 
   }