Merge pull request #50 from GSA/flask-routes

add Flask routes

.github/workflows/commit.yml

@@ -44,7 +44,7 @@ jobs:
           poetry install
 
       - name: Setup services
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Run Pytest
         run: set -o pipefail; poetry run pytest --junitxml=pytest.xml --cov=harvester ./tests/unit | tee pytest-coverage.txt

README.md

@@ -110,9 +110,9 @@ If you followed the instructions for `CKAN load testing` and `Harvester testing`
 3. when there are database DDL changes, use following steps to generate migration scripts and update database:
 
     ```bash
-    docker-compose db up
-    docker-compose run app flask db migrate -m "migration description"
-    docker-compose run app flask db upgrade
+    docker compose db up
+    docker compose run app flask db migrate -m "migration description"
+    docker compose run app flask db upgrade
     ```
 
 ### Deployment to cloud.gov

app/__init__.py

@@ -3,20 +3,31 @@
 from flask_migrate import Migrate
 import os
 from dotenv import load_dotenv
+from flask_bootstrap import Bootstrap
 
 load_dotenv()
 
 DATABASE_URI = os.getenv('DATABASE_URI')
 
-def create_app():
+def create_app(testing=False):
     app = Flask(__name__)
-    app.config['SQLALCHEMY_DATABASE_URI'] = DATABASE_URI
+
+    if testing:
+        app.config['TESTING'] = True
+        app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:'
+        app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    else:
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv("DATABASE_URI")
+        app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+        app.config['SECRET_KEY'] = os.urandom(16)
+        Bootstrap(app)
+
     db.init_app(app)
-
-    # Initialize Flask-Migrate
-    Migrate(app, db)
 
-    from .routes import register_routes
-    register_routes(app)
+    if not testing:
+        Migrate(app, db)
+
+        from .routes import register_routes
+        register_routes(app)
 
     return app

app/forms.py

@@ -0,0 +1,35 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, SubmitField, SelectField, TextAreaField
+from wtforms.validators import DataRequired, URL, ValidationError
+import re
+
+def validate_email_list(form, field):
+    emails = field.data.split(',')
+    for email in emails:
+        if not re.match(r"[^@]+@[^@]+\.[^@]+", email.strip()):
+            raise ValidationError("Invalid email address: {}".format(email))
+
+class HarvestSourceForm(FlaskForm):
+    organization_id = SelectField('Organization',
+                                  choices=[], validators=[DataRequired()])
+    name = StringField('Name', validators=[DataRequired()])
+    url = StringField('URL', validators=[DataRequired(), URL()])
+    emails = TextAreaField('Notification_emails',
+                         validators=[DataRequired(), validate_email_list])
+    frequency = SelectField('Frequency',
+                            choices=['Manual', 'Daily', 'Weekly', 'Biweekly','Monthly'],
+                            validators=[DataRequired()])
+    user_requested_frequency = StringField('User_requested_frequency',
+                                           validators=[DataRequired()])
+    schema_type = SelectField('Schema Type',
+                              choices=['strict', 'other'],
+                              validators=[DataRequired()])
+    source_type = SelectField('Source Type',
+                              choices=['Datajson', 'WAF'],
+                              validators=[DataRequired()])
+    submit = SubmitField('Submit')
+
+class OrganizationForm(FlaskForm):
+    name = StringField('Name', validators=[DataRequired()])
+    logo = StringField('Logo', validators=[DataRequired()])
+    submit = SubmitField('Submit')