fix: include gql query if request body decorator not exist

Co-authored-by: imdudu1 <[email protected]>

Author: jbl428

lib/builders/http-request.builder.ts

@@ -32,6 +32,7 @@ export class HttpRequestBuilder {
     this.payloadBuilder = new PayloadBuilder(
       this.getMetadata(REQUEST_BODY_METADATA),
       this.getMetadata(REQUEST_FORM_METADATA),
+      gqlQuery,
     );
   }
 
@@ -47,7 +48,7 @@ export class HttpRequestBuilder {
       this.pathVariableBuilder,
       this.requestParamBuilder,
     );
-    const payload = this.payloadBuilder.build(args, this.gqlQuery);
+    const payload = this.payloadBuilder.build(args);
     const headers = this.requestHeaderBuilder?.build(args);
 
     return new Request(urlBuilder.build(), {

lib/builders/payload.builder.ts

@@ -5,10 +5,11 @@ export class PayloadBuilder {
   constructor(
     private readonly requestBodyBuilder?: RequestBodyBuilder,
     private readonly requestFormBuilder?: RequestFormBuilder,
+    private readonly gqlQuery?: string,
   ) {}
 
   get contentType(): { 'Content-Type': string } | undefined {
-    if (this.requestBodyBuilder != null) {
+    if (this.gqlQuery != null || this.requestBodyBuilder != null) {
       return { 'Content-Type': 'application/json' };
     }
 
@@ -19,9 +20,13 @@ export class PayloadBuilder {
     return undefined;
   }
 
-  build(args: any[], gqlQuery?: string): BodyInit | undefined {
+  build(args: any[]): BodyInit | undefined {
+    if (this.gqlQuery != null && this.requestBodyBuilder == null) {
+      return JSON.stringify({ query: this.gqlQuery });
+    }
+
     return (
-      this.requestBodyBuilder?.build(args, gqlQuery) ??
+      this.requestBodyBuilder?.build(args, this.gqlQuery) ??
       this.requestFormBuilder?.build(args)
     );
   }

lib/supports/node-fetch.injector.spec.ts

@@ -430,7 +430,37 @@ describe('NodeFetchInjector', () => {
     expect(httpClient.requestInfo[0].headers.get('Cookie')).toBe('BAR');
   });
 
-  test('should make graphql request', async () => {
+  test('should make graphql request without variables', async () => {
+    // given
+    const query = /* GraphQL */ `
+      query hello {
+        hello
+      }
+    `;
+    @HttpInterface('https://example.com')
+    class SampleClient {
+      @GraphQLExchange(query)
+      async request(): Promise<string> {
+        return 'request';
+      }
+    }
+
+    const instance = discoveryService.addProvider(SampleClient);
+    httpClient.addResponse({ status: 'ok' });
+    nodeFetchInjector.onModuleInit();
+
+    // when
+    await instance.request();
+
+    // then
+    expect(httpClient.requestInfo).toHaveLength(1);
+    expect(await httpClient.requestInfo[0].json()).toEqual({ query });
+    expect(httpClient.requestInfo[0].headers.get('Content-Type')).toBe(
+      'application/json',
+    );
+  });
+
+  test('should make graphql request with variables', async () => {
     // given
     const query = /* GraphQL */ `
       query hello($name: String!) {
@@ -460,5 +490,8 @@ describe('NodeFetchInjector', () => {
       query,
       variables: { name: 'int' },
     });
+    expect(httpClient.requestInfo[0].headers.get('Content-Type')).toBe(
+      'application/json',
+    );
   });
 });