Merge branch 'main' into staging-merge

Signed-off-by: Spyros <[email protected]>
OWASP · Oct 28, 2023 · c4cddae · c4cddae
2 parents 9c6ce1f + b4d4882
commit c4cddae
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,6 @@ e2e:
 	export FLASK_CONFIG=development
 	flask run&
 	sleep 5
-
 	yarn test:e2e
 	killall yarn
 	killall flask
@@ -38,7 +37,6 @@ test:
 	[ -d "./venv" ] && . ./venv/bin/activate
 	export FLASK_APP=$(CURDIR)/cre.py
 	flask test
-
 cover:
 	. ./venv/bin/activate && FLASK_APP=cre.py FLASK_CONFIG=testing flask test --cover
 

diff --git a/application/frontend/src/types.ts b/application/frontend/src/types.ts
@@ -43,19 +43,3 @@ export interface PaginatedResponse {
   standards: Document[];
   total_pages: number;
 }
-
-interface GapAnalysisPathSegment {
-  start: Document;
-  end: Document;
-  relationship: string;
-}
-
-interface GapAnalysisPath {
-  end: Document;
-  path: GapAnalysisPathSegment[];
-}
-
-export interface GapAnalysisPathStart {
-  start: Document;
-  paths: Record<string, GapAnalysisPath>;
-}
diff --git a/application/tests/web_main_test.py b/application/tests/web_main_test.py
@@ -709,3 +709,4 @@ def test_gap_analysis_weak_links_response(self, db_mock) -> None:
             )
             self.assertEqual(200, response.status_code)
             self.assertEqual(expected, json.loads(response.data))
+
diff --git a/application/web/web_main.py b/application/web/web_main.py
@@ -11,7 +11,6 @@
 
 from rq import Worker, Queue, Connection, job, exceptions
 
-from application import cache
 from application.database import db
 from application.defs import cre_defs as defs
 from application.defs import osib_defs as odefs
@@ -83,7 +82,6 @@ def neo4j_not_running_rejection():
 
 @app.route("/rest/v1/id/<creid>", methods=["GET"])
 @app.route("/rest/v1/name/<crename>", methods=["GET"])
-@cache.cached(timeout=50)
 def find_cre(creid: str = None, crename: str = None) -> Any:  # refer
     database = db.Node_collection()
     include_only = request.args.getlist("include_only")
@@ -421,6 +419,8 @@ def find_root_cres() -> Any:
 
 @app.errorhandler(404)
 def page_not_found(e) -> Any:
+    from pprint import pprint
+
     return "Resource Not found", 404
Original file line number	Diff line number	Diff line change
Expand Up		@@ -709,3 +709,4 @@ def test_gap_analysis_weak_links_response(self, db_mock) -> None:
		)
		self.assertEqual(200, response.status_code)
		self.assertEqual(expected, json.loads(response.data))