Merge branch 'development' into corrects-dredd-hooks

Author: prabhupant

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ Fixes #
 
 - [ ] I have read the [Contribution & Best practices Guide](https://blog.fossasia.org/open-source-developer-guide-and-best-practices-at-fossasia) and my PR follows them.
 - [ ] My branch is up-to-date with the Upstream `development` branch.
-- [ ] The unit tests pass locally with my changes <!-- use `nosetests tests/unittests` to run all the tests -->
+- [ ] The unit tests pass locally with my changes <!-- use `nosetests tests/all` to run all the tests -->
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have added necessary documentation (if appropriate)
 <!-- If an existing function does not have a docstring, please add one -->

.travis.yml

@@ -35,7 +35,7 @@ before_script:
   - dredd
 
 script:
-  - nosetests tests/unittests -v --with-coverage
+  - nosetests tests/all -v --with-coverage
 
 after_success:
   - 'bash <(curl -s https://codecov.io/bash)'

README.md

@@ -204,13 +204,13 @@ export APP_CONFIG=config.TestingConfig
 
 * Then go to the project directory and run the following command:
 ```
-python3 -m unittest discover tests/unittests/
+python3 -m unittest discover tests/all/
 ```
 * It will run each test one by one.
 
 * You can also use the following command to run tests using nosetests:
 ```
-nosetests tests/unittests/
+nosetests tests/all/
 ```
 
 #### Running robot framework tests
@@ -252,7 +252,7 @@ This is an Open Source project and we would be happy to see contributors who rep
 We have the following branches :
  * **development**
 	 All development goes on in this branch. If you're making a contribution, please make a pull request to _development_.
-	 PRs to must pass a build check and a unit-test check on Travis (https://open-event-api.herokuapp.com - Is running off the development branch. It is hosted on Heroku.)
+	 All PRs must pass a build check and a unit-test check on Travis (https://open-event-api.herokuapp.com - Is running off the development branch. It is hosted on Heroku.)
 	 (https://api.eventyay.com - Is running off the `development` branch. Hosted on Google Cloud Platform (Google Container Engine + Kubernetes).)
  * **master**
    This contains shipped code. After significant features/bug-fixes are accumulated on development, we make a version update and make a release. (https://eventyay.com - Is running off the master branch. (whichever is the latest release.) Hosted on Google Cloud Platform (Google Container Engine + Kubernetes).)
@@ -261,7 +261,7 @@ We have the following branches :
 
 ## Release Policy
 
-The tentative release policy, for now, is, (since there is a lot of activity and a lot of bugs), an alpha release every Monday and Friday (since we see more activity on weekends). So, any bug-fixes will not be reflected at eventyay.com until a new release is made in the master branch.
+The tentative release policy, for now (since there is a lot of activity and a lot of bugs), is an alpha release every Monday and Friday (since we see more activity on weekends). So, any bug-fixes will not be reflected at eventyay.com until a new release is made in the master branch.
 
 ## Contributions Best Practices
 

app/api/helpers/files.py

@@ -251,11 +251,13 @@ def make_frontend_url(path, parameters=None):
     Create URL for frontend
     """
     settings = get_settings()
-    frontend_url = urllib.parse.urlparse(settings['frontend_url'] if settings['frontend_url'] else '')
+    frontend_url = urllib.parse.urlparse(settings.get('frontend_url') or '')
+
+    full_path = '/'.join(x.strip('/') for x in (frontend_url.path, str(path)) if x)
     return urllib.parse.urlunparse((
         frontend_url.scheme,
         frontend_url.netloc,
-        str(path),
+        full_path,
         '',
         str(urllib.parse.urlencode(parameters) if parameters else ''),
         ''

app/api/settings.py

@@ -7,6 +7,7 @@
 from app.api.schema.settings import SettingSchemaAdmin, SettingSchemaNonAdmin, SettingSchemaPublic
 from app.models import db
 from app.models.setting import Setting
+from app.settings import refresh_settings
 
 
 class Environment:
@@ -43,3 +44,7 @@ def before_get(self, args, kwargs):
     schema = SettingSchemaAdmin
     data_layer = {'session': db.session,
                   'model': Setting}
+
+    def after_patch(self, result):
+        # Update settings cache after PATCH
+        refresh_settings()

app/settings/__init__.py

@@ -6,11 +6,11 @@
 from app.models.setting import Setting, Environment
 
 
-def get_settings():
+def get_settings(from_db=False):
     """
     Use this to get latest system settings
     """
-    if 'custom_settings' in current_app.config:
+    if not from_db and 'custom_settings' in current_app.config:
         return current_app.config['custom_settings']
     s = Setting.query.order_by(desc(Setting.id)).first()
     if s is None:
@@ -22,6 +22,11 @@ def get_settings():
     return current_app.config['custom_settings']
 
 
+def refresh_settings():
+    # Force fetch settings from DB, thus refreshing it
+    get_settings(from_db=True)
+
+
 def get_setts():
     return Setting.query.order_by(desc(Setting.id)).first()
 

create_db.py

@@ -7,7 +7,7 @@
 from app import current_app
 from app.models import db
 from populate_db import populate
-from tests.unittests.auth_helper import create_super_admin
+from tests.all.integration.auth_helper import create_super_admin
 
 
 def create_default_user(email, password):

docker-compose.yml

@@ -21,7 +21,7 @@ x-defaults: &defaults
     - redis:redis
     - elastic:elastic
   volumes:
-    - ./data/web:/open_event/static
+    - ./static:/data/app/static
 
 services:
 

manage.py

@@ -10,7 +10,7 @@
 from flask_migrate import stamp
 from sqlalchemy.engine import reflection
 
-from tests.unittests.auth_helper import create_super_admin
+from tests.all.integration.auth_helper import create_super_admin
 
 
 @manager.command