Skip to content

Commit 6be1dae

Browse files
committed
feat: add null checks in getById methods across multiple services
1 parent a5a6e09 commit 6be1dae

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

src/components/d-member/DNamespaceMember.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export type DMemberDependencies = {
1919
export abstract class DNamespaceMemberReactiveService extends ReactiveArrayService<DNamespaceMemberView, DMemberDependencies> {
2020

2121
getById(id: NamespaceMember['id'], dependencies?: DMemberDependencies): DNamespaceMemberView | undefined {
22-
return this.values(dependencies).find(member => member.id === id);
22+
return this.values(dependencies).find(member => member && member.id === id);
2323
}
2424

2525
getByNamespaceIdAndUserId(namespaceId: Namespace['id'], userId: User['id']): DNamespaceMemberView | undefined {

src/components/d-namespace/DNamespace.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {ReactiveArrayService} from "../../utils";
55
export abstract class DNamespaceReactiveService extends ReactiveArrayService<DNamespaceView> {
66

77
getById(id: Namespace['id']): DNamespaceView | undefined {
8-
return this.values().find(namespace => namespace.id === id);
8+
return this.values().find(namespace => namespace && namespace.id === id);
99
}
1010

1111
}

src/components/d-organization/DOrganization.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
export abstract class DOrganizationReactiveService extends ReactiveArrayService<DOrganizationView> {
1212

1313
getById(id: Organization["id"]): DOrganizationView | undefined {
14-
return this.values().find(organization => organization.id === id)
14+
return this.values().find(organization => organization && organization.id === id)
1515
}
1616

1717
abstract organizationCreate(payload: OrganizationsCreateInput): Promise<OrganizationsCreatePayload | undefined>

src/components/d-project/DNamespaceProject.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type DProjectDependencies = {
1515
export abstract class DNamespaceProjectReactiveService extends ReactiveArrayService<DNamespaceProjectView, DProjectDependencies> {
1616

1717
getById(id: NamespaceProject['id'], dependencies?: DProjectDependencies): DNamespaceProjectView | undefined {
18-
return this.values(dependencies).find(project => project.id === id)
18+
return this.values(dependencies).find(project => project && project.id === id)
1919
}
2020

2121
abstract projectAssignRuntimes(payload: NamespacesProjectsAssignRuntimesInput): Promise<NamespacesProjectsAssignRuntimesPayload | undefined>

src/components/d-role/DNamespaceRole.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export type DRoleDependencies = {
2020
export abstract class DNamespaceRoleReactiveService extends ReactiveArrayService<DNamespaceRoleView, DRoleDependencies> {
2121

2222
getById(id: NamespaceRole['id'], dependencies?: DRoleDependencies): DNamespaceRoleView | undefined {
23-
return this.values(dependencies).find(role => role.id === id);
23+
return this.values(dependencies).find(role => role && role.id === id);
2424
}
2525

2626
abstract roleAssignAbilities(payload: NamespacesRolesAssignAbilitiesInput): Promise<NamespacesRolesAssignAbilitiesPayload | undefined>

src/components/d-runtime/DRuntime.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export type DRuntimeDependencies = {
1818
export abstract class DRuntimeReactiveService extends ReactiveArrayService<DRuntimeView, DRuntimeDependencies> {
1919

2020
getById(id: Runtime['id']): DRuntimeView | undefined {
21-
return this.values().find(runtime => runtime.id === id);
21+
return this.values().find(runtime => runtime && runtime.id === id);
2222
}
2323

2424
abstract runtimeCreate(payload: RuntimesCreateInput): Promise<RuntimesCreatePayload | undefined>

src/components/d-user/DUser.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ReactiveArrayService} from "../../utils/reactiveArrayService";
1+
import {ReactiveArrayService} from "../../utils";
22
import {
33
User,
44
UsersEmailVerificationInput,
@@ -36,11 +36,11 @@ export abstract class DUserReactiveService extends ReactiveArrayService<DUserVie
3636
//no id's need to be injected here because the root query has a users field
3737

3838
getById(id: User['id']): DUserView | undefined {
39-
return this.values().find(user => user.id === id);
39+
return this.values().find(user => user && user.id === id);
4040
}
4141

4242
getByUsername(username: User['username']): DUserView | undefined {
43-
return this.values().find(user => user.username === username);
43+
return this.values().find(user => user && user.username === username);
4444
}
4545

4646
abstract usersEmailVerification(payload: UsersEmailVerificationInput): Promise<UsersEmailVerificationPayload | undefined>;

0 commit comments

Comments
 (0)