add migrate for db update

GSA · Mar 13, 2024 · 8d1e08a · 8d1e08a · github-actions · Mar 13, 2024
1 parent 2e86055
commit 8d1e08a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/app/__init__.py b/app/__init__.py
@@ -1,17 +1,19 @@
 from flask import Flask
 from .models import db
+from flask_migrate import Migrate
 import os
 
 DATABASE_URI = os.getenv('DATABASE_URI')
 
 def create_app():
     app = Flask(__name__)
-    app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://myuser:mypassword@db/mydb'
-    app.config['SECRET_KEY'] = '12345678'
+    app.config['SQLALCHEMY_DATABASE_URI'] = DATABASE_URI
     db.init_app(app)
 
-    with app.app_context():
-        db.create_all()
+    migrate = Migrate(app, db)
+
+    # with app.app_context():
+    #     db.create_all()
 
     from .routes import register_routes
     register_routes(app)

diff --git a/app/routes.py b/app/routes.py
@@ -5,7 +5,7 @@
 mod = Blueprint('harvest', __name__)
 db = HarvesterDBInterface()
 
-@mod.route('/index', methods=['GET'])
+@mod.route('/', methods=['GET'])
 def index():
     return render_template('index.html')
 
@@ -75,4 +75,5 @@ def get_harvest_error(error_id):
         return "provide error_id"
 
 def register_routes(app):
-    app.register_blueprint(mod, url_prefix='/api')
+    # app.register_blueprint(mod, url_prefix='/api')
+    app.register_blueprint(mod)
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -22,15 +22,15 @@
 <body>
     <h2>Harvest Actions</h2>
     <ul>
-        <li><a href="/api/add_source">Add Harvest Source</a></li>
-        <li><a href="/api/add_job">Add Harvest Job</a></li>
-        <li><a href="/api/add_error">Add Harvest Error</a></li>
-        <li><a href="/api/harvest_sources">Get All Harvest Sources</a></li>
-        <li><a href="/api/harvest_jobs">Get All Harvest Jobs</a></li>
-        <li><a href="/api/harvest_errors_by_job/<job_id>">Get All Harvest Errors By Job</a></li>
-        <li><a href="/api/harvest_source/<source_id>">Get Harvest Source</a></li>
-        <li><a href="/api/harvest_job/<job_id>">Get Harvest Job</a></li>
-        <li><a href="/api/harvest_error/<error_id>">Get Harvest Error</a></li>
+        <li><a href="/add_source">Add Harvest Source</a></li>
+        <li><a href="/add_job">Add Harvest Job</a></li>
+        <li><a href="/add_error">Add Harvest Error</a></li>
+        <li><a href="/harvest_sources">Get All Harvest Sources</a></li>
+        <li><a href="/harvest_jobs">Get All Harvest Jobs</a></li>
+        <li><a href="/harvest_errors_by_job/<job_id>">Get All Harvest Errors By Job</a></li>
+        <li><a href="/harvest_source/<source_id>">Get Harvest Source</a></li>
+        <li><a href="/harvest_job/<job_id>">Get Harvest Job</a></li>
+        <li><a href="/harvest_error/<error_id>">Get Harvest Error</a></li>
     </ul>
 </body>
 </html>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -54,6 +54,8 @@ services:
     build: .
     depends_on:
       - db
+    volumes:
+      - .:/app
     environment:
       DATABASE_URI: ${DATABASE_URI}
       FLASK_APP: run.py
File	Stmts	Miss	Cover	Missing
harvester
__init__.py	1	0	100%
ckan_utils.py	42	2	2	95%
harvest.py	411	67	67	84%
utils.py	43	7	7	84%
TOTAL	497	76	85%