From 5a054fef9274be1bf8eaebb0c943b0ccc529045b Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Mon, 17 Oct 2022 16:46:14 -0700 Subject: [PATCH] [EC-86] Refactor group API request models - Move organizationGroupBulkRequest to group requests folder - Fix relative imports in GroupService --- .../abstractions/group/group.service.abstraction.ts | 2 +- libs/common/src/services/group/group.service.ts | 10 +++++----- .../group/requests/organizationGroupBulkRequest.ts} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename libs/common/src/{models/request/OrganizationGroupBulkRequest.ts => services/group/requests/organizationGroupBulkRequest.ts} (100%) diff --git a/libs/common/src/abstractions/group/group.service.abstraction.ts b/libs/common/src/abstractions/group/group.service.abstraction.ts index 3076220000c..b55a1b847a6 100644 --- a/libs/common/src/abstractions/group/group.service.abstraction.ts +++ b/libs/common/src/abstractions/group/group.service.abstraction.ts @@ -1,4 +1,4 @@ -import { GroupView } from "@bitwarden/common/models/view/groupView"; +import { GroupView } from "../../models/view/groupView"; export class GroupServiceAbstraction { delete: (orgId: string, groupId: string) => Promise; diff --git a/libs/common/src/services/group/group.service.ts b/libs/common/src/services/group/group.service.ts index c249e4b9102..bfa3ce7b146 100644 --- a/libs/common/src/services/group/group.service.ts +++ b/libs/common/src/services/group/group.service.ts @@ -1,12 +1,12 @@ -import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { ApiService } from "../../abstractions/api.service"; import { GroupDetailsResponse, GroupResponse, GroupServiceAbstraction, -} from "@bitwarden/common/abstractions/group"; -import { OrganizationGroupBulkRequest } from "@bitwarden/common/models/request/OrganizationGroupBulkRequest"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { GroupView } from "@bitwarden/common/models/view/groupView"; +} from "../../abstractions/group"; +import { ListResponse } from "../../models/response/listResponse"; +import { GroupView } from "../../models/view/groupView"; +import { OrganizationGroupBulkRequest } from "../../services/group/requests/OrganizationGroupBulkRequest"; export class GroupService implements GroupServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/models/request/OrganizationGroupBulkRequest.ts b/libs/common/src/services/group/requests/organizationGroupBulkRequest.ts similarity index 100% rename from libs/common/src/models/request/OrganizationGroupBulkRequest.ts rename to libs/common/src/services/group/requests/organizationGroupBulkRequest.ts