chore: Release 1.7.0 to master (#6541)

chore: Release 1.7.0 to master

Author: iamareebjamal

.circleci/config.yml

@@ -0,0 +1,54 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/python:3.7.4-node
+        environment:
+            APP_CONFIG: config.TestingConfig
+            DATABASE_URL: postgresql://postgres@localhost/test
+            TEST_DATABASE_URL: postgresql://postgres@localhost/test
+      # Services
+      - image: circleci/postgres:11.5-alpine-ram
+        environment:
+            POSTGRES_USER: postgres
+            POSTGRES_DB: test
+      - image: circleci/redis:5.0.6-alpine
+
+    working_directory: ~/code
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1.3-dependencies-{{ checksum "requirements/tests.txt" }}-{{ checksum "package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1.3-dependencies-
+
+      - run:
+          name: Install Python Dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install --exists-action w -r requirements/tests.txt
+      
+      - run:
+          name: Install Node Dependencies
+          command: yarn
+
+      - save_cache:
+          paths:
+            - ./venv
+            - ./node_modules
+            - ~/.cache/yarn
+            - ~/.yarn/bin
+          key: v1.3-dependencies-{{ checksum "requirements/tests.txt" }}-{{ checksum "package.json" }}
+
+      - run:
+          name: Create API blueprint
+          command: npx aglio --input docs/api/api_blueprint_source.apib --compile --output docs/api/api_blueprint.apib
+      
+      - run:
+          name: Test API Doc
+          command: . venv/bin/activate && npx dredd

.gitignore

@@ -55,3 +55,7 @@ src
 
 #tickets
 generated/
+
+docker-compose.override.yml
+celerybeat-schedule.*
+.coverage

.travis.yml

@@ -1,7 +1,10 @@
 language: python
 
+dist: xenial
+
 services:
   - docker
+  - postgresql
 
 addons:
   apt:
@@ -10,17 +13,11 @@ addons:
       - libssl-dev
       - libffi-dev
 
-python:
-  - '3.6'
+python: 3.7
 
 cache: pip
 
-before-install:
-  - npm -g install npm@latest
-
 install:
-  - npm install -g aglio
-  - npm install -g [email protected]
   - pip3 install -r requirements/tests.txt
 
 env:
@@ -31,8 +28,6 @@ before_script:
   - export DATABASE_URL=postgresql://postgres@localhost:5432/test
   - export TEST_DATABASE_URL=postgresql://postgres@localhost:5432/test
   - bash scripts/test_multiple_heads.sh
-  - aglio --input docs/api/api_blueprint_source.apib --compile --output docs/api/api_blueprint.apib
-  - dredd
 
 script:
   - nosetests tests/all -v --with-coverage

CHANGELOG.md

@@ -0,0 +1,22 @@
+## Changelog
+
+##### v1.8.0 (Unreleased):
+
+- No Changes
+
+##### v1.7.0 (2019-10-19):
+
+- ** BREAKING ** Requires Python 3.7
+- Add info endpoint to get server version
+- Add management script to switch modules on or off
+- Increase gunicorn workers in docker and add options for configuration
+- Fix CSV export *(included as hotfix in previous version)*
+- Fix order PDF not found errors by mounting `generated` folder in docker
+- Fix ICal attribute errors and add tests
+- Fix Pentabarf export and add tests
+- Add workaround for multiprocess engine forking
+- Use pool pre ping option to avoid dropped connections
+- Add .env in docker compose to override environment variables
+- Configure redis and celery in sentry integration
+- Convert some classes to dataclasses
+- Update dependencies

Dockerfile

@@ -1,8 +1,7 @@
-FROM python:3.6-alpine as base
+FROM python:3.7-alpine as base
 LABEL maintainer="Niranjan Rajendran <[email protected]>"
 
-##
-##
+####
 
 FROM base as builder
 
@@ -18,19 +17,17 @@ ADD requirements /requirements/
 
 RUN wget https://bootstrap.pypa.io/ez_setup.py && python ez_setup.py
 
-ENV PYTHONPATH /install/lib/python3.6/site-packages
+ENV PYTHONPATH /install/lib/python3.7/site-packages
 RUN pip install --install-option="--prefix=/install" setuptools && \
     LIBRARY_PATH=/lib:/usr/lib pip install --install-option="--prefix=/install" -r /requirements.txt
 
-
-##
-##
+####
 
 FROM base
 
 COPY --from=builder /install /usr/local
 RUN apk --no-cache add postgresql-dev ca-certificates libxslt jpeg zlib file libxml2 git && \
-    pip install git+https://github.com/fossasia/flask-rest-jsonapi.git@shubhamp-master#egg=flask-rest-jsonapi
+    pip install git+https://github.com/fossasia/flask-rest-jsonapi.git@0.12.6.1#egg=flask-rest-jsonapi
 
 WORKDIR /data/app
 ADD . .

README.md

@@ -2,10 +2,11 @@
 
 ![Open Event Server](/docs/images/open-event-server.png)
 
-[![GitHub release](https://img.shields.io/badge/release-1.0.0--alpha.10-blue.svg?style=flat-square)](https://github.com/fossasia/open-event-server/releases/latest)
+[![GitHub release](https://img.shields.io/github/release/fossasia/open-event-server.svg)](https://github.com/fossasia/open-event-server/releases/latest)
 [![Build Status](https://travis-ci.org/fossasia/open-event-server.svg?branch=development)](https://travis-ci.org/fossasia/open-event-server)
+[![CircleCI Build Staus Badge](https://img.shields.io/circleci/build/github/fossasia/open-event-server?label=CircleCI%20Build)](https://www.circleci.com/gh/fossasia/open-event-server)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1ac554483fac462797ffa5a8b9adf2fa?style=flat-square)](https://www.codacy.com/app/fossasia/open-event-server)
-[![Codecov branch](https://codecov.io/gh/fossasia/open-event-server/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/fossasia/open-event-server)
+[![Codecov branch](https://codecov.io/gh/fossasia/open-event-server/branch/development/graph/badge.svg?style=flat-square)](https://codecov.io/gh/fossasia/open-event-server)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-ff006f.svg?style=flat-square)](https://gitter.im/fossasia/open-event-server)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 [![Mailing List](https://img.shields.io/badge/Mailing%20List-FOSSASIA-blue.svg)](https://groups.google.com/forum/#!forum/open-event)
@@ -66,7 +67,7 @@ Please get familiar with the components of the project in order to be able to co
 * App server - [uWSGI](https://github.com/unbit/uwsgi)
 * Web Server - [NGINX](https://www.nginx.com)
 
-Note that open-event-server **works with Python 3.6** at the moment.
+Note that open-event-server **works with Python 3.7** at the moment.
 
 ### External Service Dependencies
 
@@ -193,6 +194,34 @@ Clone the repo and set up the server according to the steps listed. Make sure yo
 pip3 install -r requirements/tests.txt
 ```
 
+#### Enable/Disable modules
+
+-   Enable/Disable a specific module
+
+```
+python manage.py module --name module_name --switch on/off
+```
+
+**_Example :_**
+
+```
+python manage.py module --name ticket_include --switch on
+python manage.py module -n ticket_include -s off
+```
+
+-   Enable/Disable all modules
+
+```
+python manage.py module --name module_name --switch on/off
+```
+
+**_Example :_**
+
+```
+python manage.py module --name all --switch on
+python manage.py module -n all -s off
+```
+
 #### Running unit tests
 
 * Open Event uses Postgres database for testing. So set `DATABASE_URL` as a postgres database. Here is an example.

app/__init__.py

@@ -32,6 +32,7 @@
 import stripe
 from app.settings import get_settings
 from app.models import db
+from app.models.utils import add_engine_pidguard, sqlite_datetime_fix
 from app.api.helpers.jwt import jwt_user_loader
 from app.api.helpers.cache import cache
 from werkzeug.middleware.profiler import ProfilerMiddleware
@@ -59,7 +60,7 @@
 env.read_envfile()
 
 
-class ReverseProxied(object):
+class ReverseProxied:
     """
     ReverseProxied flask wsgi app wrapper from http://stackoverflow.com/a/37842465/1562480 by aldel
     """
@@ -149,6 +150,7 @@ def create_app():
         from app.api.admin_translations import admin_blueprint
         from app.api.orders import alipay_blueprint
         from app.api.settings import admin_misc_routes
+        from app.api.server_version import info_route
 
         app.register_blueprint(api_v1)
         app.register_blueprint(event_copy)
@@ -167,6 +169,12 @@ def create_app():
         app.register_blueprint(admin_blueprint)
         app.register_blueprint(alipay_blueprint)
         app.register_blueprint(admin_misc_routes)
+        app.register_blueprint(info_route)
+
+        add_engine_pidguard(db.engine)
+
+        if app.config['SQLALCHEMY_DATABASE_URI'].startswith("sqlite://"):
+            sqlite_datetime_fix()
 
     sa.orm.configure_mappers()
 

app/api/helpers/ICalExporter.py

@@ -47,8 +47,7 @@ def export(event_id):
 
             for speaker in session.speakers:
                 # Ref: http://icalendar.readthedocs.io/en/latest/usage.html#file-structure
-                # can use speaker.email below but privacy reasons
-                attendee = vCalAddress('MAILTO:' + event.email if event.email else '[email protected]')
+                attendee = vCalAddress('MAILTO:' + speaker.email if speaker.email else '[email protected]')
                 attendee.params['cn'] = vText(speaker.name)
                 event_component.add('attendee', attendee)
 

app/api/helpers/db.py

@@ -1,6 +1,7 @@
 import logging
 import traceback
 
+from flask import request
 from flask_rest_jsonapi.exceptions import ObjectNotFound
 from sqlalchemy import func
 from sqlalchemy.orm.exc import NoResultFound
@@ -63,7 +64,11 @@ def safe_query(self, model, column_name, value, parameter_name):
     :return:
     """
     try:
-        record = self.session.query(model).filter(getattr(model, column_name) == value).one()
+        record = self.session.query(model).filter(getattr(model, column_name) == value)
+        if request.args.get('get_trashed') != 'true':
+            if hasattr(model, 'deleted_at'):
+                record = record.filter(model.deleted_at == None)
+        record = record.one()
     except NoResultFound:
         raise ObjectNotFound({'parameter': '{}'.format(parameter_name)},
                              "{}: {} not found".format(model.__name__, value))

app/api/helpers/payment.py

@@ -27,7 +27,7 @@ def forex(from_currency, to_currency, amount):
         return amount
 
 
-class StripePaymentsManager(object):
+class StripePaymentsManager:
     """
     Class to manage payments through Stripe.
     """
@@ -135,7 +135,7 @@ def capture_payment(order_invoice, currency=None, credentials=None):
             raise ConflictException({'pointer': ''}, str(e))
 
 
-class PayPalPaymentsManager(object):
+class PayPalPaymentsManager:
     """
     Class to manage payment through Paypal REST API.
     """
@@ -265,7 +265,7 @@ def execute_payment(paypal_payer_id, paypal_payment_id):
             return False, payment.error
 
 
-class AliPayPaymentsManager(object):
+class AliPayPaymentsManager:
     """
     Class to manage AliPay Payments
     """
@@ -294,7 +294,7 @@ def charge_source(order_identifier):
         return charge
 
 
-class OmisePaymentsManager(object):
+class OmisePaymentsManager:
     """
     Class to manage Omise Payments
     """
@@ -320,7 +320,7 @@ def charge_payment(order_identifier, token):
         return charge
 
 
-class PaytmPaymentsManager(object):
+class PaytmPaymentsManager:
     """
     Class to manage PayTM payments
     """