diff --git a/libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts b/libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts index 18d365ed8f4..c21a1ffb1cc 100644 --- a/libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts +++ b/libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; +import { OrganizationDomainResponse } from "./responses/organization-domain.response"; export class OrgDomainApiServiceAbstraction { getAllByOrgId: (orgId: string) => Promise>; diff --git a/libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts b/libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts index 33b95ffb887..da8ecc7192e 100644 --- a/libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts +++ b/libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts @@ -1,6 +1,6 @@ import { Observable } from "rxjs"; -import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; +import { OrganizationDomainResponse } from "./responses/organization-domain.response"; export abstract class OrgDomainServiceAbstraction { orgDomains$: Observable; diff --git a/libs/common/src/models/response/organization-domain.response.ts b/libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts similarity index 89% rename from libs/common/src/models/response/organization-domain.response.ts rename to libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts index e57cfed3e47..999d34495fa 100644 --- a/libs/common/src/models/response/organization-domain.response.ts +++ b/libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class OrganizationDomainResponse extends BaseResponse { id: string; @@ -21,6 +21,7 @@ export class OrganizationDomainResponse extends BaseResponse { this.jobRunCount = this.getResponseProperty("JobRunCount"); this.verifiedDate = this.getResponseProperty("VerifiedDate"); + // TODO: come back and eval if this is necessary or not // Might be worth converting string dates to actual dates for ease of use // this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null; // this.nextRunDate = obj.nextRunDate != null ? new Date(obj.nextRunDate) : null; diff --git a/libs/common/src/services/organization-domain/org-domain-api.service.ts b/libs/common/src/services/organization-domain/org-domain-api.service.ts index 4986065b15a..e1b2090f47f 100644 --- a/libs/common/src/services/organization-domain/org-domain-api.service.ts +++ b/libs/common/src/services/organization-domain/org-domain-api.service.ts @@ -1,9 +1,9 @@ import { OrgDomainApiServiceAbstraction } from "../../abstractions/organization-domain/org-domain-api.service.abstraction"; -import { OrganizationDomainRequest } from "../../models/request/organization-domain.request"; -import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; +import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response"; import { ApiService } from "../api.service"; import { OrgDomainService } from "./org-domain.service"; +import { OrganizationDomainRequest } from "./requests/organization-domain.request"; export class OrgDomainApiService implements OrgDomainApiServiceAbstraction { constructor(private orgDomainService: OrgDomainService, private apiService: ApiService) {} diff --git a/libs/common/src/services/organization-domain/org-domain.service.ts b/libs/common/src/services/organization-domain/org-domain.service.ts index 99a8cdf8a4b..1761a5636d9 100644 --- a/libs/common/src/services/organization-domain/org-domain.service.ts +++ b/libs/common/src/services/organization-domain/org-domain.service.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from "rxjs"; import { OrgDomainInternalServiceAbstraction } from "../../abstractions/organization-domain/org-domain.service.abstraction"; -import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; +import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response"; export class OrgDomainService implements OrgDomainInternalServiceAbstraction { protected _orgDomains$: BehaviorSubject = new BehaviorSubject([]); diff --git a/libs/common/src/models/request/organization-domain.request.ts b/libs/common/src/services/organization-domain/requests/organization-domain.request.ts similarity index 65% rename from libs/common/src/models/request/organization-domain.request.ts rename to libs/common/src/services/organization-domain/requests/organization-domain.request.ts index 98be6c3caf3..54e9fd96f51 100644 --- a/libs/common/src/models/request/organization-domain.request.ts +++ b/libs/common/src/services/organization-domain/requests/organization-domain.request.ts @@ -1,4 +1,4 @@ -import { OrganizationDomainResponse } from "../response/organization-domain.response"; +import { OrganizationDomainResponse } from "../../../abstractions/organization-domain/responses/organization-domain.response"; export class OrganizationDomainRequest { txt: string;