migrated polls

epomatti · May 28, 2022 · 4f8bc77 · 4f8bc77
1 parent 0348621
commit 4f8bc77
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 155 deletions.
diff --git a/microservices/poll/Pipfile b/microservices/poll/Pipfile
@@ -11,6 +11,7 @@ cerberus = "*"
 azure-keyvault-secrets = "*"
 azure-identity = "*"
 msal = "*"
+epomatti-aksmrc-core = "*"
 
 [dev-packages]
 autopep8 = "*"

diff --git a/microservices/poll/Pipfile.lock b/microservices/poll/Pipfile.lock
diff --git a/microservices/poll/src/app.py b/microservices/poll/src/app.py
@@ -1,6 +1,6 @@
 from flask import request, Flask
 
-from src.validators import validate_schema
+from epomatti_aksmrc_core import validators
 from src.schemas import pool_schema, increment_schema
 from src import repository
 
@@ -17,7 +17,7 @@ def readyness():
 
 
 @app.route(BASE_PATH, methods=['POST'])
-@validate_schema(schema=pool_schema)
+@validators.validate_schema(schema=pool_schema)
 def post():
     result = repository.create_poll(request.get_json())
     return {"id": str(result.inserted_id)}, 201
@@ -41,22 +41,11 @@ def get(id):
 
 
 @app.route(f"{BASE_PATH}/inc", methods=['PATCH'])
-@validate_schema(schema=increment_schema)
+@validators.validate_schema(schema=increment_schema)
 def increment():
     id = request.get_json()['id']
     repository.increment_votes(id)
     return ''
 
-# TODO: implement
-# @app.route(f"{BASE_PATH}/val", methods=['POST'])
-# @validate_schema(schema=increment_schema)
-# def validate():
-#     val_json = request.get_json()
-#     id = val_json['id']
-#     option = val_json['option']
-#     repository.increment_votes(id)
-#     return ''
-
-
 def create_app():
     return app
diff --git a/microservices/poll/src/keyvault.py b/microservices/poll/src/keyvault.py
diff --git a/microservices/poll/src/mongo.py b/microservices/poll/src/mongo.py
diff --git a/microservices/poll/src/msal.py b/microservices/poll/src/msal.py
diff --git a/microservices/poll/src/repository.py b/microservices/poll/src/repository.py
@@ -1,5 +1,5 @@
 from bson import ObjectId
-from . import mongo
+from epomatti_aksmrc_core import mongo
 
 
 def create_poll(poll):

diff --git a/microservices/poll/src/token_credential.py b/microservices/poll/src/token_credential.py
diff --git a/microservices/poll/src/utils.py b/microservices/poll/src/utils.py
diff --git a/microservices/poll/src/validators.py b/microservices/poll/src/validators.py