Skip to content

Commit ed0696f

Browse files
committed
Switch to EdgeDB typenames for Engagements
1 parent 23f1a6e commit ed0696f

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/components/engagement/dto/engagement.dto.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
DateInterval,
88
DateTimeField,
99
DbLabel,
10+
DBNames,
1011
IntersectTypes,
1112
parentIdMiddleware,
1213
Resource,
@@ -47,7 +48,7 @@ export type AnyEngagement = MergeExclusive<
4748
const Interfaces = IntersectTypes(Resource, ChangesetAware);
4849

4950
export const resolveEngagementType = (val: Pick<AnyEngagement, '__typename'>) =>
50-
val.__typename === 'LanguageEngagement'
51+
val.__typename === 'default::LanguageEngagement'
5152
? LanguageEngagement
5253
: InternshipEngagement;
5354

@@ -65,7 +66,7 @@ class Engagement extends Interfaces {
6566
static readonly Parent = import('../../project/dto').then((m) => m.IProject);
6667
static readonly resolve = resolveEngagementType;
6768

68-
declare readonly __typename: 'LanguageEngagement' | 'InternshipEngagement';
69+
declare readonly __typename: DBNames<typeof e.Engagement>;
6970

7071
readonly project: LinkTo<'Project'> & Pick<IProject, 'status' | 'type'>;
7172

@@ -155,7 +156,7 @@ export class LanguageEngagement extends Engagement {
155156
(m) => m.TranslationProject,
156157
);
157158

158-
declare readonly __typename: 'LanguageEngagement';
159+
declare readonly __typename: DBNames<typeof e.LanguageEngagement>;
159160

160161
@Field(() => TranslationProject)
161162
declare readonly parent: BaseNode;
@@ -196,7 +197,7 @@ export class InternshipEngagement extends Engagement {
196197
(m) => m.InternshipProject,
197198
);
198199

199-
declare readonly __typename: 'InternshipEngagement';
200+
declare readonly __typename: DBNames<typeof e.InternshipEngagement>;
200201

201202
@Field(() => InternshipProject)
202203
declare readonly parent: BaseNode;

src/components/engagement/engagement.repository.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {
3636
filter,
3737
FullTextIndex,
3838
INACTIVE,
39+
listConcat,
3940
matchChangesetAndChangedProps,
4041
matchProjectSens,
4142
matchPropsAndProjectSensAndScopedRoles,
@@ -169,9 +170,12 @@ export class EngagementRepository extends CommonRepository {
169170
])
170171
.return<{ dto: UnsecuredDto<Engagement> }>(
171172
merge('props', 'changedProps', {
172-
__typename: typenameForView(
173-
['LanguageEngagement', 'InternshipEngagement'],
174-
view,
173+
__typename: listConcat(
174+
'"default::"',
175+
typenameForView(
176+
['LanguageEngagement', 'InternshipEngagement'],
177+
view,
178+
),
175179
),
176180
parent: 'project',
177181
project: {

0 commit comments

Comments
 (0)