fix response and request type (#29)

palantir · Jun 20, 2018 · 7ca501a · 7ca501a
1 parent 7aff077
commit 7ca501a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/commands/generate/__tests__/serviceGeneratorTest.ts b/src/commands/generate/__tests__/serviceGeneratorTest.ts
@@ -113,6 +113,31 @@ describe("serviceGenerator", () => {
     });
 
     it("handles binary body and return types", async () => {
+        await generateService(
+            {
+                endpoints: [
+                    {
+                        args: [],
+                        endpointName: "foo",
+                        httpMethod: HttpMethod.GET,
+                        httpPath: "/bar",
+                        markers: [],
+                        returns: { primitive: PrimitiveType.BINARY, type: "primitive" },
+                    },
+                ],
+                serviceName: { name: "MyService", package: "com.palantir.services" },
+            },
+            new Map(),
+            simpleAst,
+        );
+        const outFile = path.join(outDir, "services/myService.ts");
+        const contents = fs.readFileSync(outFile, "utf8");
+        expect(contents).toContain("foo(): Promise<any>;");
+        expect(contents).toContain(`requestMediaType: MediaType.APPLICATION_JSON`);
+        expect(contents).toContain(`responseMediaType: MediaType.APPLICATION_OCTET_STREAM`);
+    });
+
+    it("handle binary return and json request types", async () => {
         await generateService(
             {
                 endpoints: [

diff --git a/src/commands/generate/serviceGenerator.ts b/src/commands/generate/serviceGenerator.ts
@@ -185,8 +185,8 @@ function generateEndpointBody(
         }
         return `"${paramId}": ${argDefinition.argName},`;
     });
-    const requestMediaType = mediaType(returnType);
-    const responseMediaType = mediaType(bodyType);
+    const requestMediaType = mediaType(bodyType);
+    const responseMediaType = mediaType(returnType);
 
     return writer => {
         writer.write(`return this.${BRIDGE}.callEndpoint<${returnTsType}>(`).inlineBlock(() => {