From 2701c647af20be0353521baff9e4068f3f147a9a Mon Sep 17 00:00:00 2001
From: Tommi Pulli <tommi.pulli7@gmail.com>
Date: Thu, 18 Jun 2020 13:28:08 +0300
Subject: [PATCH] CSCFAIRMETA-632: [FIX] fix swagger references and api schemas

- v1 swagger remote references were not updated to point to v1 api-
  schemas. This was discovered only after running deploy_nginx.
- Api-schemas had some extra trailing commas which caused swagger to
  not showing the model
---
 .../api/rest/base/api_schemas/catalogrecord.json          | 4 ++--
 swagger/v1/swagger.yaml                                   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/metax_api/api/rest/base/api_schemas/catalogrecord.json b/src/metax_api/api/rest/base/api_schemas/catalogrecord.json
index 0a87458e..91a8c6ec 100644
--- a/src/metax_api/api/rest/base/api_schemas/catalogrecord.json
+++ b/src/metax_api/api/rest/base/api_schemas/catalogrecord.json
@@ -327,7 +327,7 @@
                     "description":"Catalog record deprecation state.",
                     "type":"string",
                     "readonly": true
-                },
+                }
             }
         },
         "CatalogRecordVersionCreatedInfo":{
@@ -359,7 +359,7 @@
                     "readonly": true,
                     "enum":[
                         "dataset",
-                        "pas",
+                        "pas"
                     ]
                 }
             },
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index d39a7208..a1d5ad21 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -1841,13 +1841,13 @@ parameters:
 
 definitions:
   CatalogRecord:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/catalogrecord.json#/definitions/CatalogRecord'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/catalogrecord.json#/definitions/CatalogRecord'
   DataCatalog:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/datacatalog.json#/definitions/Catalog'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/datacatalog.json#/definitions/Catalog'
   File:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/file.json#/definitions/File'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/file.json#/definitions/File'
   Directory:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/file.json#/definitions/Directory'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/file.json#/definitions/Directory'
   StringList:
     type: array
     items: