From ccbc9ea4559d7f3402e6d422b745b465b4c33d48 Mon Sep 17 00:00:00 2001
From: c8y3 <25362953+c8y3@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:20:08 +0200
Subject: [PATCH] [IMP] Moved endpoint_removed out of util.py into blueprints
 namespace

---
 source/app/blueprints/rest/case/case_notes_routes.py |  2 +-
 source/app/blueprints/rest/endpoints.py              | 12 +++++++++++-
 source/app/blueprints/rest/profile_routes.py         |  2 +-
 source/app/util.py                                   | 10 ----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/source/app/blueprints/rest/case/case_notes_routes.py b/source/app/blueprints/rest/case/case_notes_routes.py
index faae9d8d0..320a69ef6 100644
--- a/source/app/blueprints/rest/case/case_notes_routes.py
+++ b/source/app/blueprints/rest/case/case_notes_routes.py
@@ -54,7 +54,7 @@
 from app.schema.marshables import CommentSchema
 from app.blueprints.access_controls import ac_requires_case_identifier
 from app.blueprints.access_controls import ac_api_requires
-from app.util import endpoint_removed
+from app.blueprints.rest.endpoints import endpoint_removed
 from app.util import response_error
 from app.util import response_success
 
diff --git a/source/app/blueprints/rest/endpoints.py b/source/app/blueprints/rest/endpoints.py
index 8edd331f5..6180fe081 100644
--- a/source/app/blueprints/rest/endpoints.py
+++ b/source/app/blueprints/rest/endpoints.py
@@ -17,9 +17,10 @@
 #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 from functools import wraps
+
 from app import app
-from app.business.errors import BusinessProcessingError
 from app.util import response
+from app.util import response_error
 
 logger = app.logger
 
@@ -60,3 +61,12 @@ def wrap(*args, **kwargs):
             return result
         return wrap
     return inner_wrap
+
+
+def endpoint_removed(message, version):
+    def inner_wrap(f):
+        @wraps(f)
+        def wrap(*args, **kwargs):
+            return response_error(f"Endpoint deprecated in {version}. {message}.", status=410)
+        return wrap
+    return inner_wrap
diff --git a/source/app/blueprints/rest/profile_routes.py b/source/app/blueprints/rest/profile_routes.py
index c2c871668..c9b027e26 100644
--- a/source/app/blueprints/rest/profile_routes.py
+++ b/source/app/blueprints/rest/profile_routes.py
@@ -37,7 +37,7 @@
 from app.blueprints.access_controls import ac_api_requires
 from app.util import response_error
 from app.util import response_success
-from app.util import endpoint_removed
+from app.blueprints.rest.endpoints import endpoint_removed
 
 profile_rest_blueprint = Blueprint('profile_rest', __name__)
 
diff --git a/source/app/util.py b/source/app/util.py
index 1bcdec577..1dcef3162 100644
--- a/source/app/util.py
+++ b/source/app/util.py
@@ -37,7 +37,6 @@
 from flask import session
 from flask import url_for
 from flask_login import current_user
-from functools import wraps
 from pathlib import Path
 from pyunpack import Archive
 from sqlalchemy.ext.declarative import DeclarativeMeta
@@ -234,15 +233,6 @@ def regenerate_session():
     session.modified = True
 
 
-def endpoint_removed(message, version):
-    def inner_wrap(f):
-        @wraps(f)
-        def wrap(*args, **kwargs):
-            return response_error(f"Endpoint deprecated in {version}. {message}.", status=410)
-        return wrap
-    return inner_wrap
-
-
 def decompress_7z(filename: Path, output_dir):
     """
     Decompress a 7z file in specified output directory