Skip to content

Commit 8d460b1

Browse files
committed
fix: better to give new name to Interface rather than user type
1 parent 62946c3 commit 8d460b1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/__tests__/integration-discriminators-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('#78 Mongoose and Discriminators', () => {
4747
`{
4848
eventFindMany {
4949
__typename
50-
... on GenericEvent {
50+
... on Event {
5151
refId
5252
}
5353
... on ClickedLinkEvent {
@@ -62,8 +62,8 @@ describe('#78 Mongoose and Discriminators', () => {
6262
expect(res).toEqual({
6363
data: {
6464
eventFindMany: [
65-
{ __typename: 'GenericEvent', refId: 'aaa' },
66-
{ __typename: 'GenericEvent', refId: 'bbb' },
65+
{ __typename: 'Event', refId: 'aaa' },
66+
{ __typename: 'Event', refId: 'bbb' },
6767
{ __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ccc', url: 'url1' },
6868
{ __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ddd', url: 'url2' },
6969
],

src/composeWithMongooseDiscriminators.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function getBaseTCFieldsWithTypes(baseTC: TypeComposer) {
8383

8484
function createDInterface(baseModelTC: DiscriminatorTypeComposer): GraphQLInterfaceType {
8585
return new GraphQLInterfaceType({
86-
name: baseModelTC.getDBaseName(),
86+
name: `${baseModelTC.getDBaseName()}Interface`,
8787

8888
resolveType: (value: any) => {
8989
const childDName = value[baseModelTC.getDKey()];
@@ -147,7 +147,7 @@ export class DiscriminatorTypeComposer extends TypeComposer {
147147
opts.customizationOptions && opts.customizationOptions.schemaComposer
148148
? opts.customizationOptions.schemaComposer
149149
: schemaComposer;
150-
this.setTypeName(`Generic${this.modelName}`);
150+
this.setTypeName(this.modelName);
151151
this.DKeyETC = createAndSetDKeyETC(this, this.discriminators);
152152

153153
reorderFields(this, (this.opts: any).reorderFields, this.discriminatorKey);

0 commit comments

Comments
 (0)