From ee5c8ea449514ea8656bf017f7ea88f1e1297efd Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 8 Dec 2021 11:30:09 +0000
Subject: [PATCH] Move query to common definitions and add openapi-types to dev
 dependencies

---
 packages/server/package.json                  |  2 +-
 .../src/api/controllers/query/import/index.ts |  4 +--
 .../query/import/sources/base/index.ts        | 25 +++----------------
 .../controllers/query/import/sources/curl.ts  |  3 ++-
 .../query/import/sources/openapi2.ts          |  3 ++-
 packages/server/src/definitions/common.ts     | 22 ++++++++++++++++
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index f3ad9e06f..92772b489 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -111,7 +111,6 @@
     "mysql2": "^2.3.1",
     "node-fetch": "2.6.0",
     "open": "^8.4.0",
-    "openapi-types": "^9.3.1",
     "pg": "8.5.1",
     "pino-pretty": "4.0.0",
     "posthog-node": "^1.1.4",
@@ -150,6 +149,7 @@
     "eslint": "^6.8.0",
     "jest": "^27.0.5",
     "nodemon": "^2.0.4",
+    "openapi-types": "^9.3.1",
     "path-to-regexp": "^6.2.0",
     "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
diff --git a/packages/server/src/api/controllers/query/import/index.ts b/packages/server/src/api/controllers/query/import/index.ts
index 50aeed714..c99d89c2d 100644
--- a/packages/server/src/api/controllers/query/import/index.ts
+++ b/packages/server/src/api/controllers/query/import/index.ts
@@ -1,10 +1,10 @@
 import CouchDB from "../../../../db"
 import { queryValidation } from "../validation"
 import { generateQueryID } from "../../../../db/utils"
-import { Query, ImportInfo, ImportSource } from "./sources/base"
+import { ImportInfo, ImportSource } from "./sources/base"
 import { OpenAPI2 } from "./sources/openapi2"
+import { Query } from './../../../../definitions/common';
 import { Curl } from "./sources/curl"
-
 interface ImportResult {
   errorQueries: Query[]
   queries: Query[]
diff --git a/packages/server/src/api/controllers/query/import/sources/base/index.ts b/packages/server/src/api/controllers/query/import/sources/base/index.ts
index a2522f0b0..8f41f4afd 100644
--- a/packages/server/src/api/controllers/query/import/sources/base/index.ts
+++ b/packages/server/src/api/controllers/query/import/sources/base/index.ts
@@ -1,28 +1,9 @@
-export interface ImportInfo {
-  url: string
-  name: string
-}
 
-export interface QueryParameter {
-  name: string
-  default: string
-}
+import { Query, QueryParameter } from "../../../../../../definitions/common"
 
-export interface Query {
-  _id?: string
-  datasourceId: string
+export interface ImportInfo {
+  url: string
   name: string
-  parameters: QueryParameter[]
-  fields: {
-    headers: object
-    queryString: string | null
-    path: string
-    requestBody: string | undefined
-  }
-  transformer: string | null
-  schema: any
-  readable: boolean
-  queryVerb: string
 }
 
 enum MethodToVerb {
diff --git a/packages/server/src/api/controllers/query/import/sources/curl.ts b/packages/server/src/api/controllers/query/import/sources/curl.ts
index e4289016c..ae580f65e 100644
--- a/packages/server/src/api/controllers/query/import/sources/curl.ts
+++ b/packages/server/src/api/controllers/query/import/sources/curl.ts
@@ -1,4 +1,5 @@
-import { ImportSource, ImportInfo, Query } from "./base"
+import { ImportSource, ImportInfo } from "./base"
+import { Query } from "../../../../../definitions/common"
 import { URL } from "url"
 const curlconverter = require("curlconverter")
 
diff --git a/packages/server/src/api/controllers/query/import/sources/openapi2.ts b/packages/server/src/api/controllers/query/import/sources/openapi2.ts
index 92aac1274..c13f1e2d2 100644
--- a/packages/server/src/api/controllers/query/import/sources/openapi2.ts
+++ b/packages/server/src/api/controllers/query/import/sources/openapi2.ts
@@ -1,4 +1,5 @@
-import { ImportInfo, QueryParameter, Query } from "./base"
+import { ImportInfo } from "./base"
+import { Query, QueryParameter } from "../../../../../definitions/common"
 import { OpenAPIV2 } from "openapi-types"
 import { OpenAPISource } from "./base/openapi"
 
diff --git a/packages/server/src/definitions/common.ts b/packages/server/src/definitions/common.ts
index c085773fa..818168641 100644
--- a/packages/server/src/definitions/common.ts
+++ b/packages/server/src/definitions/common.ts
@@ -107,3 +107,25 @@ export interface Datasource extends Base {
     [key: string]: Table
   }
 }
+
+export interface QueryParameter {
+  name: string
+  default: string
+}
+
+export interface Query {
+  _id?: string
+  datasourceId: string
+  name: string
+  parameters: QueryParameter[]
+  fields: {
+    headers: object
+    queryString: string | null
+    path: string
+    requestBody: string | undefined
+  }
+  transformer: string | null
+  schema: any
+  readable: boolean
+  queryVerb: string
+}