From 9513a9ebef4b05f6626733befd40a62afe2e9c7b Mon Sep 17 00:00:00 2001
From: Prabhat Singh <59395410+TestPrab@users.noreply.github.com>
Date: Mon, 23 Aug 2021 12:48:34 +0530
Subject: [PATCH] Minor improvements (#1682)

* Added Schema Check in bcf routes

* Basic Changes

Co-authored-by: Dion Moult <dion@thinkmoult.com>
---
 src/bcf/bcf/v3/bcfapi.py                     | 20 +++++++++++++-------
 src/foundationserver/bcfserver/bcf/routes.py |  3 +--
 src/foundationserver/requirements.txt        |  1 +
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/bcf/bcf/v3/bcfapi.py b/src/bcf/bcf/v3/bcfapi.py
index ad96af138c..0ec2cf262f 100644
--- a/src/bcf/bcf/v3/bcfapi.py
+++ b/src/bcf/bcf/v3/bcfapi.py
@@ -281,6 +281,9 @@ class BcfClient:
             f"{self.baseurl}/projects/{project_id}/topics/{topic_id}/snippet",
             headers=headers,
         )
+        # TODO: write to tmpdir
+        with open(f"{project_id}_{topic_id}_snippet.txt", "w") as f:
+            f.write(response.content.decode("utf-8"))
         return response.status_code, response.content
 
     def update_snippet(self, project_id="", topic_id="", files=None, data=None):
@@ -533,14 +536,17 @@ class BcfClient:
         return response.status_code
 
     def get_document(self, project_id="", topic_id="", document_id="") -> str:
-        return self.get(
-            f"/projects/{project_id}/topics/{topic_id}/documents/{document_id}",
-            {
-                "project_id": project_id,
-                "topic_id": topic_id,
-                "document_id": document_id,
-            },
+        headers = {
+            "Authorization": "Bearer " + self.foundation_client.get_access_token(),
+            "Content-type": "application/octet-stream",
+        }
+        response = requests.get(
+            f"{self.baseurl}/projects/{project_id}/topics/documents/{document_id}",
+            headers=headers,
         )
+        with open(f"{project_id}_{topic_id}_{document_id}_document.txt", "w") as f:
+            f.write(response.content.decode("utf-8"))
+        return response.status_code, response.content
 
     def get_topics_events(self, project_id="") -> list:
         return self.get(
diff --git a/src/foundationserver/bcfserver/bcf/routes.py b/src/foundationserver/bcfserver/bcf/routes.py
index f9c3f2d5b6..d9a1450bc7 100644
--- a/src/foundationserver/bcfserver/bcf/routes.py
+++ b/src/foundationserver/bcfserver/bcf/routes.py
@@ -1,7 +1,6 @@
-from flask import jsonify, url_for, redirect, render_template, request, session, flash
+from flask import jsonify, url_for, redirect, render_template, request, session, send_file
 from flask_login import login_user, logout_user, login_required, current_user
 from flask.blueprints import Blueprint
-from werkzeug.utils import send_file
 from foundation.models import User, OAuth2AuthorizationCode, OAuth2Token, OAuth2Client
 from run import app, db
 import json
diff --git a/src/foundationserver/requirements.txt b/src/foundationserver/requirements.txt
index c40a961538..da6ed384fe 100644
--- a/src/foundationserver/requirements.txt
+++ b/src/foundationserver/requirements.txt
@@ -6,3 +6,4 @@ Flask-SQLAlchemy==2.5.1
 Flask-WTF==0.15.1
 Flask-Bcrypt==0.7.1
 bcrypt==3.2.0
+flask-expects-json==1.6.0
\ No newline at end of file