bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

SG-680 - Refactor Org Domain API & domain services to conform to ADR 0013 - Avoid layered folder structure for request/response models (i.e., put models near "owner" services)

Browse Source
This commit is contained in:
Jared Snider
2022-12-02 16:51:07 -05:00
parent a8d79b78cd
commit 729d21d3c4
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts
View File

@@ -1,4 +1,4 @@
import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; import { OrganizationDomainResponse } from "./responses/organization-domain.response";
export class OrgDomainApiServiceAbstraction { export class OrgDomainApiServiceAbstraction {
getAllByOrgId: (orgId: string) => Promise<Array<OrganizationDomainResponse>>; getAllByOrgId: (orgId: string) => Promise<Array<OrganizationDomainResponse>>;

2
libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts
View File

@@ -1,6 +1,6 @@
import { Observable } from "rxjs"; import { Observable } from "rxjs";
import { OrganizationDomainResponse } from "../../models/response/organization-domain.response"; import { OrganizationDomainResponse } from "./responses/organization-domain.response";
export abstract class OrgDomainServiceAbstraction { export abstract class OrgDomainServiceAbstraction {
orgDomains$: Observable<OrganizationDomainResponse[]>; orgDomains$: Observable<OrganizationDomainResponse[]>;

3
libs/common/src/models/response/organization-domain.response.ts → libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts
View File

@@ -1,4 +1,4 @@
import { BaseResponse } from "./base.response"; import { BaseResponse } from "../../../models/response/base.response";
export class OrganizationDomainResponse extends BaseResponse { export class OrganizationDomainResponse extends BaseResponse {
id: string; id: string;
@@ -21,6 +21,7 @@ export class OrganizationDomainResponse extends BaseResponse {
this.jobRunCount = this.getResponseProperty("JobRunCount"); this.jobRunCount = this.getResponseProperty("JobRunCount");
this.verifiedDate = this.getResponseProperty("VerifiedDate"); 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 // Might be worth converting string dates to actual dates for ease of use
// this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null; // this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null;
// this.nextRunDate = obj.nextRunDate != null ? new Date(obj.nextRunDate) : null; // this.nextRunDate = obj.nextRunDate != null ? new Date(obj.nextRunDate) : null;

4
libs/common/src/services/organization-domain/org-domain-api.service.ts
View File

@@ -1,9 +1,9 @@
import { OrgDomainApiServiceAbstraction } from "../../abstractions/organization-domain/org-domain-api.service.abstraction"; import { OrgDomainApiServiceAbstraction } from "../../abstractions/organization-domain/org-domain-api.service.abstraction";
import { OrganizationDomainRequest } from "../../models/request/organization-domain.request"; import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
import { OrganizationDomainResponse } from "../../models/response/organization-domain.response";
import { ApiService } from "../api.service"; import { ApiService } from "../api.service";
import { OrgDomainService } from "./org-domain.service"; import { OrgDomainService } from "./org-domain.service";
import { OrganizationDomainRequest } from "./requests/organization-domain.request";
export class OrgDomainApiService implements OrgDomainApiServiceAbstraction { export class OrgDomainApiService implements OrgDomainApiServiceAbstraction {
constructor(private orgDomainService: OrgDomainService, private apiService: ApiService) {} constructor(private orgDomainService: OrgDomainService, private apiService: ApiService) {}

2
libs/common/src/services/organization-domain/org-domain.service.ts
View File

@@ -1,7 +1,7 @@
import { BehaviorSubject } from "rxjs"; import { BehaviorSubject } from "rxjs";
import { OrgDomainInternalServiceAbstraction } from "../../abstractions/organization-domain/org-domain.service.abstraction"; 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 { export class OrgDomainService implements OrgDomainInternalServiceAbstraction {
protected _orgDomains$: BehaviorSubject<OrganizationDomainResponse[]> = new BehaviorSubject([]); protected _orgDomains$: BehaviorSubject<OrganizationDomainResponse[]> = new BehaviorSubject([]);

2
libs/common/src/models/request/organization-domain.request.ts → libs/common/src/services/organization-domain/requests/organization-domain.request.ts
View File

@@ -1,4 +1,4 @@
import { OrganizationDomainResponse } from "../response/organization-domain.response"; import { OrganizationDomainResponse } from "../../../abstractions/organization-domain/responses/organization-domain.response";
export class OrganizationDomainRequest { export class OrganizationDomainRequest {
txt: string; txt: string;