15672: Fixes filter usage on favorite service.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/src/services/favorite-service/favorite-service.test.ts b/src/services/favorite-service/favorite-service.test.ts
index beaf869eeedb0a0594e20c81e32e2206f2cac2ae..566b4cbcf82a857c6cbee714a102dd482358c586 100644 (file)
--- a/src/services/favorite-service/favorite-service.test.ts
+++ b/src/services/favorite-service/favorite-service.test.ts
@@ -39,9 +39,9 @@ describe("FavoriteService", () => {
     it("unmarks resource as favorite", async () => {
         const list = jest.fn().mockReturnValue(Promise.resolve({ items: [{ uuid: "linkUuid" }] }));
         const filters = new FilterBuilder()
-            .addEqual('tailUuid', "userUuid")
-            .addEqual('headUuid', "resourceUuid")
-            .addEqual('linkClass', LinkClass.STAR);
+            .addEqual('tail_uuid', "userUuid")
+            .addEqual('head_uuid', "resourceUuid")
+            .addEqual('link_class', LinkClass.STAR);
         linkService.list = list;
         linkService.delete = jest.fn().mockReturnValue(Promise.resolve({ uuid: "linkUuid" }));
         const favoriteService = new FavoriteService(linkService, groupService);
@@ -56,8 +56,8 @@ describe("FavoriteService", () => {
     it("lists favorite resources", async () => {
         const list = jest.fn().mockReturnValue(Promise.resolve({ items: [{ headUuid: "headUuid" }] }));
         const listFilters = new FilterBuilder()
-            .addEqual('tailUuid', "userUuid")
-            .addEqual('linkClass', LinkClass.STAR);
+            .addEqual('tail_uuid', "userUuid")
+            .addEqual('link_class', LinkClass.STAR);
         const contents = jest.fn().mockReturnValue(Promise.resolve({ items: [{ uuid: "resourceUuid" }] }));
         const contentFilters = new FilterBuilder().addIn('uuid', ["headUuid"]);
         linkService.list = list;
@@ -75,9 +75,9 @@ describe("FavoriteService", () => {
     it("checks if resources are present in favorites", async () => {
         const list = jest.fn().mockReturnValue(Promise.resolve({ items: [{ headUuid: "foo" }] }));
         const listFilters = new FilterBuilder()
-            .addIn("headUuid", ["foo", "oof"])
-            .addEqual("tailUuid", "userUuid")
-            .addEqual("linkClass", LinkClass.STAR);
+            .addIn("head_uuid", ["foo", "oof"])
+            .addEqual("tail_uuid", "userUuid")
+            .addEqual("link_class", LinkClass.STAR);
         linkService.list = list;
         const favoriteService = new FavoriteService(linkService, groupService);
 

diff --git a/src/services/favorite-service/favorite-service.ts b/src/services/favorite-service/favorite-service.ts
index c41b2b992e10aafd33f07353f17087834ecf8a68..8b504c867fe7f781a42ad064878ede727921fe80 100644 (file)
--- a/src/services/favorite-service/favorite-service.ts
+++ b/src/services/favorite-service/favorite-service.ts
@@ -36,9 +36,9 @@ export class FavoriteService {
         return this.linkService
             .list({
                 filters: new FilterBuilder()
-                    .addEqual('tailUuid', data.userUuid)
-                    .addEqual('headUuid', data.resourceUuid)
-                    .addEqual('linkClass', LinkClass.STAR)
+                    .addEqual('tail_uuid', data.userUuid)
+                    .addEqual('head_uuid', data.resourceUuid)
+                    .addEqual('link_class', LinkClass.STAR)
                     .getFilters()
             })
             .then(results => Promise.all(
@@ -47,8 +47,8 @@ export class FavoriteService {
 
     list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}): Promise<ListResults<GroupContentsResource>> {
         const listFilters = new FilterBuilder()
-            .addEqual('tailUuid', userUuid)
-            .addEqual('linkClass', LinkClass.STAR)
+            .addEqual('tail_uuid', userUuid)
+            .addEqual('link_class', LinkClass.STAR)
             .getFilters();
 
         return this.linkService
@@ -74,9 +74,9 @@ export class FavoriteService {
         return this.linkService
             .list({
                 filters: new FilterBuilder()
-                    .addIn("headUuid", resourceUuids)
-                    .addEqual("tailUuid", userUuid)
-                    .addEqual("linkClass", LinkClass.STAR)
+                    .addIn("head_uuid", resourceUuids)
+                    .addEqual("tail_uuid", userUuid)
+                    .addEqual("link_class", LinkClass.STAR)
                     .getFilters()
             })
             .then(({ items }) => resourceUuids.reduce((results, uuid) => {