From 85c3efb482e9432ff12ebfd086c8920be9896986 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 20 Jul 2014 16:30:53 -0400 Subject: [PATCH 01/17] adding group --- requirements.txt | 4 + studygroup/application.py | 1 + studygroup/exceptions.py | 17 ++++- studygroup/forms.py | 45 +++++++++-- studygroup/models.py | 11 +++ studygroup/templates/show_group.html | 21 ++++++ studygroup/views.py | 33 ++++++++- tests/test_membership.py | 107 +++++++++++++++++++++++++++ 8 files changed, 226 insertions(+), 13 deletions(-) create mode 100644 tests/test_membership.py diff --git a/requirements.txt b/requirements.txt index 5936510..050ac7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,10 @@ itsdangerous==0.23 oauthlib==0.6.1 psycopg2==2.5.2 wsgiref==0.1.2 +lxml==3.3.5 +requests==2.3.0 +cssselect==0.9.1 +mock==1.0.1 # Only for testing (separate out?) Flask-Testing==0.4 diff --git a/studygroup/application.py b/studygroup/application.py index d2a87d7..800c472 100644 --- a/studygroup/application.py +++ b/studygroup/application.py @@ -11,6 +11,7 @@ oauth = OAuth() migrate = Migrate() + def create_app(debug=True): from views import studygroup diff --git a/studygroup/exceptions.py b/studygroup/exceptions.py index c306f13..7f97a5b 100644 --- a/studygroup/exceptions.py +++ b/studygroup/exceptions.py @@ -1,10 +1,21 @@ - class ModelNotFoundException(Exception): pass -class GroupFullException(Exception): +class FormValidationException(Exception): + pass + +class UnAuthorizedException(FormValidationException): + def __init__(self, member_id): + message = "UnAuthorized action for member with Id: %s " % (member_id) + super(UnAuthorizedException, self).__init__(message) + +class MembershipException(FormValidationException): + def __init__(self, member_id, group_id): + message = "Member {%s} is already part of group: {%s} " % (member_id, group_id) + super(MembershipException, self).__init__(message) +class GroupFullException(FormValidationException): def __init__(self, group): message = "Group: %s Id: %s" % (group.name, group.id) - super(GroupFullException, self).__init__(message) \ No newline at end of file + super(GroupFullException, self).__init__(message) diff --git a/studygroup/forms.py b/studygroup/forms.py index d491683..2aff1ed 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -1,12 +1,12 @@ from flask import g from flask_wtf import Form -from wtforms import TextField, TextAreaField, IntegerField -from wtforms.validators import DataRequired +from wtforms import TextField, TextAreaField, IntegerField, ValidationError +from wtforms.validators import DataRequired, Required from wtforms.widgets import HiddenInput from .application import db from .models import Group, Membership, ROLE_GROUP_LEADER -from .exceptions import GroupFullException +from .exceptions import GroupFullException, UnAuthorizedException, MembershipException class GroupForm(Form): @@ -35,17 +35,50 @@ def save(self): class MembershipForm(Form): - user_id = IntegerField(widget=HiddenInput(), validators=[DataRequired()]) group_id = IntegerField(widget=HiddenInput(), validators=[DataRequired()]) + def __init__(self, user_id, *args, **kwargs): + self.user_id = user_id + super(MembershipForm, self).__init__(*args, **kwargs) + + def validate_group_id(form, field): + user_id = form._get_user() + group = Group.by_id_with_memberships(field.data) + form._validate_full_group(group) + form._validate_existing_member(group.id, user_id) + + def _validate_existing_member(self, group_id, user_id): + member = Membership.by_group_and_user_ids(group_id, user_id) + if member: + raise ValidationError(u'This member is already in this group') + + def _validate_full_group(self, group): + if group.is_full(): + raise ValidationError(u'This group is full') + + def _get_user(self): + user_id = getattr(self, 'user_id', None) + + if user_id is None: + raise ValidationError(u'Invalid user') + return user_id + def save(self): group = Group.by_id_with_memberships(self.group_id.data) + if group.is_full(): raise GroupFullException(group) + user_id = self._get_user() + + member = Membership.by_group_and_user_ids(group.id, user_id) + + if member: + raise MembershipException(group.id, user_id) + membership = Membership( - user_id=self.user_id.data, - group_id=self.group_id.data + user_id=user_id, + group_id=group.id ) db.session.add(membership) diff --git a/studygroup/models.py b/studygroup/models.py index 63cdfa8..4e6bf53 100644 --- a/studygroup/models.py +++ b/studygroup/models.py @@ -1,6 +1,7 @@ """ Data models for StudyGroups """ +from sqlalchemy import UniqueConstraint from .application import db import settings @@ -23,6 +24,16 @@ class Membership(db.Model): group_id = db.Column(db.Integer, db.ForeignKey('group.id')) role = db.Column(db.Integer, nullable=False, default=ROLE_MEMBER) + __table_args__ = ( + UniqueConstraint('user_id', 'group_id', name='_group_user_uc'), + ) + + @classmethod + def by_group_and_user_ids(cls, group_id, user_id): + return Membership.query.filter_by( + group_id=group_id, + user_id=user_id + ) class Group(db.Model): id = db.Column(db.Integer, primary_key=True) diff --git a/studygroup/templates/show_group.html b/studygroup/templates/show_group.html index d2babc8..b0652e8 100644 --- a/studygroup/templates/show_group.html +++ b/studygroup/templates/show_group.html @@ -1,4 +1,5 @@ {% extends "bootstrap/base.html" %} +{% import "bootstrap/wtf.html" as wtf %} {% block title %}Studygroup | Groups{% endblock %} {% block styles %} @@ -28,6 +29,26 @@

{{ g.group.name }}

{{ g.group.description }}
+
+

Members: {{ g.group.memberships | length }}

+
+ {% if form.errors %} + + {% endif %} + +
+
+ {{ form.hidden_tag() }} + {{ wtf.form_errors(form, hiddens="only") }} + +
+

© Boston Python User Group 2014

diff --git a/studygroup/views.py b/studygroup/views.py index 3060ac1..e5f1e30 100644 --- a/studygroup/views.py +++ b/studygroup/views.py @@ -1,10 +1,11 @@ from flask import (g, request, redirect, render_template, session, url_for, jsonify, Blueprint) -from .models import User, Group +from .models import User, Group, Membership from .application import db, meetup from .auth import login_required -from .forms import GroupForm +from .forms import GroupForm, MembershipForm +from studygroup.exceptions import FormValidationException studygroup = Blueprint("studygroup", __name__, static_folder='static') @@ -27,10 +28,34 @@ def show_groups(): g.groups = Group.all_with_memberships() return render_template('groups.html') -@studygroup.route('/group/') +@studygroup.route('/group/', methods=('POST', 'GET')) +@login_required def show_group(id): g.group = Group.query.filter_by(id=id).first() - return render_template('show_group.html') + if request.method == 'POST': + return _show_group_post(id) + else: + return render_show_group(g.group) + +def _show_group_post(group): + form = MembershipForm(session.get('user_id')) + if form.validate_on_submit(): + try: + form.save() + except FormValidationException as e: + form.form_errors = e.message + return render_show_group(group, form) + +def render_show_group(group, form=None): + if not form: + user_id = session.get('user_id') + membership = Membership( + user_id=user_id, + group_id=group.id + ) + form=MembershipForm(user_id, obj=membership) + + return render_template('show_group.html', form=form) @studygroup.route('/group/new', methods=('GET', 'POST')) def new_group(): diff --git a/tests/test_membership.py b/tests/test_membership.py new file mode 100644 index 0000000..043104a --- /dev/null +++ b/tests/test_membership.py @@ -0,0 +1,107 @@ +from wtforms import ValidationError +from studygroup.exceptions import GroupFullException, MembershipException +from studygroup.forms import MembershipForm +from tests.tools import StudyGroupTestCase +import mock + +class MembershipPageTest(StudyGroupTestCase): + pass + +class MembershipFormTest(StudyGroupTestCase): + + @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') + def test_validate_existing_member(self, by_group_and_user_ids): + by_group_and_user_ids.return_value = [23] + form = MembershipForm(23) + with self.assertRaisesRegexp(ValidationError, u'This member is already in this group'): + form._validate_existing_member(23, 33) + + by_group_and_user_ids.assert_called_with(23, 33) + + def test_validate_full_group(self): + group = mock.Mock(name='group', spec=['is_full']) + group.is_full.return_value = True + form = MembershipForm(23) + with self.assertRaisesRegexp(ValidationError, u'This group is full'): + form._validate_full_group(group) + + self.assertTrue(group.is_full.called) + + def test_get_user(self): + form = MembershipForm(23) + self.assertEqual(form._get_user(), 23) + + def test_no_user(self): + form = MembershipForm(23) + form.user_id = None + with self.assertRaisesRegexp(ValidationError, u'Invalid user'): + form._get_user() + + @mock.patch('studygroup.forms.Group.by_id_with_memberships') + def test_validate_group_id(self, by_id_with_memberships): + group = mock.Mock(name='group', id=7) + by_id_with_memberships.return_value = group + + form = MembershipForm(23) + form._validate_full_group = mock.Mock() + form._validate_existing_member = mock.Mock() + field = mock.Mock(name='field', spec=['data']) + field.data = 'FormData' + + form.validate_group_id(field) + + form._validate_full_group.assert_called_with(group) + form._validate_existing_member.assert_called_with(7, 23) + by_id_with_memberships.assert_called_with('FormData') + + @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') + @mock.patch('studygroup.forms.Group.by_id_with_memberships') + @mock.patch('studygroup.forms.db.session') + def test_save(self, session, by_id_with_memberships, by_group_and_user_ids): + group = mock.Mock(name='group', id=7) + group.is_full.return_value = False + by_id_with_memberships.return_value = group + by_group_and_user_ids.return_value = None + form = MembershipForm(23) + form.group_id.data = 88 + + form.save() + + by_id_with_memberships.assert_called_with(88) + by_group_and_user_ids.assert_called_with(7, 23) + + self.assertTrue(session.add.called) + self.assertTrue(session.commit.called) + + @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') + @mock.patch('studygroup.forms.Group.by_id_with_memberships') + @mock.patch('studygroup.forms.db.session') + def test_save_full_group(self, session, by_id_with_memberships, by_group_and_user_ids): + group = mock.Mock(name='group', id=7) + group.is_full.return_value = True + by_id_with_memberships.return_value = group + form = MembershipForm(23) + with self.assertRaises(GroupFullException): + form.save() + + self.assertFalse(session.add.called) + self.assertFalse(session.commit.called) + + @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') + @mock.patch('studygroup.forms.Group.by_id_with_memberships') + @mock.patch('studygroup.forms.db.session') + def test_save_member(self, session, by_id_with_memberships, by_group_and_user_ids): + group = mock.Mock(name='group', id=7) + group.is_full.return_value = False + by_id_with_memberships.return_value = group + by_group_and_user_ids.return_value = [23] + form = MembershipForm(23) + with self.assertRaises(MembershipException): + form.save() + + self.assertFalse(session.add.called) + self.assertFalse(session.commit.called) + + +class MembershipModelTest(StudyGroupTestCase): + pass From 206673599dae3dcf8cc5b74d88e642cd232f4bb5 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 20 Jul 2014 17:52:40 -0400 Subject: [PATCH 02/17] adding membership --- studygroup/models.py | 2 +- tests/test_membership.py | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/studygroup/models.py b/studygroup/models.py index 4e6bf53..94bc7aa 100644 --- a/studygroup/models.py +++ b/studygroup/models.py @@ -33,7 +33,7 @@ def by_group_and_user_ids(cls, group_id, user_id): return Membership.query.filter_by( group_id=group_id, user_id=user_id - ) + ).first() class Group(db.Model): id = db.Column(db.Integer, primary_key=True) diff --git a/tests/test_membership.py b/tests/test_membership.py index 043104a..9905c56 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -1,6 +1,8 @@ from wtforms import ValidationError from studygroup.exceptions import GroupFullException, MembershipException from studygroup.forms import MembershipForm +from studygroup.application import db +from studygroup.models import Group, Membership from tests.tools import StudyGroupTestCase import mock @@ -104,4 +106,28 @@ def test_save_member(self, session, by_id_with_memberships, by_group_and_user_id class MembershipModelTest(StudyGroupTestCase): - pass + + def setUp(self): + super(MembershipModelTest, self).setUp() + self.group = Group( + name='group', + description='description' + ) + db.session.add(self.group) + db.session.commit() + + def test_group_user(self): + membership = Membership( + user_id=self.alice_id, + group_id=self.group.id + ) + + db.session.add(membership) + db.session.commit() + + actual = Membership.by_group_and_user_ids(self.group.id, self.alice_id) + self.assertEqual(membership, actual) + + def test_group_user_not_found(self): + actual = Membership.by_group_and_user_ids(self.group.id, self.alice_id,) + self.assertIsNone(actual) From 59a6c95c1e1b0eb9b43ad7f8a31e7dc872d93646 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 20 Jul 2014 20:52:37 -0400 Subject: [PATCH 03/17] adding tests --- studygroup/forms.py | 4 +- studygroup/views.py | 2 +- tests/test_membership.py | 94 +++++++++++++++++++++++++++++++++++----- tests/tools.py | 3 ++ 4 files changed, 88 insertions(+), 15 deletions(-) diff --git a/studygroup/forms.py b/studygroup/forms.py index 2aff1ed..b9dc9cc 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -1,12 +1,12 @@ from flask import g from flask_wtf import Form from wtforms import TextField, TextAreaField, IntegerField, ValidationError -from wtforms.validators import DataRequired, Required +from wtforms.validators import DataRequired from wtforms.widgets import HiddenInput from .application import db from .models import Group, Membership, ROLE_GROUP_LEADER -from .exceptions import GroupFullException, UnAuthorizedException, MembershipException +from .exceptions import GroupFullException, MembershipException class GroupForm(Form): diff --git a/studygroup/views.py b/studygroup/views.py index e5f1e30..4ede96d 100644 --- a/studygroup/views.py +++ b/studygroup/views.py @@ -53,7 +53,7 @@ def render_show_group(group, form=None): user_id=user_id, group_id=group.id ) - form=MembershipForm(user_id, obj=membership) + form = MembershipForm(user_id, obj=membership) return render_template('show_group.html', form=form) diff --git a/tests/test_membership.py b/tests/test_membership.py index 9905c56..1ac1e29 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -1,3 +1,4 @@ +from flask import url_for, Response from wtforms import ValidationError from studygroup.exceptions import GroupFullException, MembershipException from studygroup.forms import MembershipForm @@ -6,8 +7,86 @@ from tests.tools import StudyGroupTestCase import mock -class MembershipPageTest(StudyGroupTestCase): - pass + +class GroupBaseTestCase(StudyGroupTestCase): + + def setUp(self): + super(GroupBaseTestCase, self).setUp() + self.group = Group( + name='group name', + description='description' + ) + db.session.add(self.group) + db.session.commit() + + +class MembershipPageTest(GroupBaseTestCase): + + def test_show_group_auth(self): + resp = self.client.get(url_for('studygroup.show_group', id=self.group.id)) + self.assert302(resp) + + def test_show_group_auth(self): + self.login(self.alice_id) + resp = self.client.get(url_for('studygroup.show_group', id=self.group.id)) + self.assert200(resp) + self.assertIn('

{}

'.format(self.group.name), resp.data) + + def test_show_group_post_auth(self): + resp = self.client.post(url_for('studygroup.show_group', id=self.group.id)) + self.assert302(resp) + + def test_show_group_post(self): + self.login(self.alice_id) + + data = { + 'group_id': self.group.id, + } + + member = Membership.by_group_and_user_ids(self.group.id, self.alice_id) + self.assertIsNone(member) + + resp = self.client.post( + url_for('studygroup.show_group', id=self.group.id), + data=data + ) + + member = Membership.by_group_and_user_ids(self.group.id, self.alice_id) + self.assertIsNotNone(member) + self.assert200(resp) + self.assertIn('Members: 1', resp.data) + + def test_bad_group(self): + self.login(self.alice_id) + data = {} + + resp = self.client.post( + url_for('studygroup.show_group', id=self.group.id), + data=data + ) + self.assert200(resp) + self.assertIn('This field is required.', resp.data) + + def test_existing_membership(self): + self.login(self.alice_id) + membership = Membership( + user_id=self.alice_id, + group_id=self.group.id + ) + db.session.add(membership) + db.session.commit() + + data = { + 'group_id': self.group.id, + } + + resp = self.client.post( + url_for('studygroup.show_group', id=self.group.id), + data=data + ) + self.assert200(resp) + self.assertIn('This member is already in this group', resp.data) + class MembershipFormTest(StudyGroupTestCase): @@ -105,16 +184,7 @@ def test_save_member(self, session, by_id_with_memberships, by_group_and_user_id self.assertFalse(session.commit.called) -class MembershipModelTest(StudyGroupTestCase): - - def setUp(self): - super(MembershipModelTest, self).setUp() - self.group = Group( - name='group', - description='description' - ) - db.session.add(self.group) - db.session.commit() +class MembershipModelTest(GroupBaseTestCase): def test_group_user(self): membership = Membership( diff --git a/tests/tools.py b/tests/tools.py index 0675b01..ee23776 100644 --- a/tests/tools.py +++ b/tests/tools.py @@ -58,3 +58,6 @@ def login(self, user_id): """ with self.client.session_transaction() as session: session['user_id'] = user_id + + def assert302(self, response): + self.assertStatus(response, 302) From 9351127005b2e99ebdb7052657786e3abae397bb Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 3 Aug 2014 21:44:30 -0400 Subject: [PATCH 04/17] adding messaging on group join --- settings.py | 2 +- studygroup/forms.py | 8 ++++ studygroup/messaging.py | 26 ++++++++++++ studygroup/models.py | 7 +++ studygroup/templates/email/joined_group.txt | 3 ++ studygroup/views.py | 13 +++--- tests/test_membership.py | 47 +++++++++++++++++---- tests/tools.py | 10 +++++ 8 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 studygroup/messaging.py create mode 100644 studygroup/templates/email/joined_group.txt diff --git a/settings.py b/settings.py index 93a535c..b93634d 100644 --- a/settings.py +++ b/settings.py @@ -12,4 +12,4 @@ try: from settings_local import * except ImportError: - pass \ No newline at end of file + pass diff --git a/studygroup/forms.py b/studygroup/forms.py index b9dc9cc..aacb2e8 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -7,6 +7,7 @@ from .application import db from .models import Group, Membership, ROLE_GROUP_LEADER from .exceptions import GroupFullException, MembershipException +from studygroup.messaging import send_join_notification class GroupForm(Form): @@ -83,5 +84,12 @@ def save(self): db.session.add(membership) db.session.commit() + leader_membership = Membership.by_group_leader(group.id) + + send_join_notification( + leader_membership.user, + membership.user, + group + ) return membership diff --git a/studygroup/messaging.py b/studygroup/messaging.py new file mode 100644 index 0000000..87959b0 --- /dev/null +++ b/studygroup/messaging.py @@ -0,0 +1,26 @@ +from flask import render_template +from .application import meetup + + +def send_message(subject, recipient, text_body): + response = meetup.post( + '2/message', + data={ + 'subject': subject, + 'message': text_body, + 'member_id': long(recipient.meetup_member_id) + }, + ) + return response + + +def send_join_notification(recipient, user, group): + send_message( + 'BostonPython: {0} is joining you at {1}!'.format(user.full_name, group.name), + recipient, + render_template( + 'email/joined_group.txt', + user=user, + group=group + ) + ) diff --git a/studygroup/models.py b/studygroup/models.py index 94bc7aa..8e2b5da 100644 --- a/studygroup/models.py +++ b/studygroup/models.py @@ -35,6 +35,13 @@ def by_group_and_user_ids(cls, group_id, user_id): user_id=user_id ).first() + @classmethod + def by_group_leader(cls, group_id): + return Membership.query.filter_by( + group_id=group_id, + role=ROLE_GROUP_LEADER + ).first() + class Group(db.Model): id = db.Column(db.Integer, primary_key=True) name = db.Column(db.String, unique=True) diff --git a/studygroup/templates/email/joined_group.txt b/studygroup/templates/email/joined_group.txt new file mode 100644 index 0000000..52c510b --- /dev/null +++ b/studygroup/templates/email/joined_group.txt @@ -0,0 +1,3 @@ +Congratulations {{ user.full_name }} joined group {{ group.name }}, + +You now have {{ group.memberships | length }} users going! diff --git a/studygroup/views.py b/studygroup/views.py index 4ede96d..d5f9ba6 100644 --- a/studygroup/views.py +++ b/studygroup/views.py @@ -5,6 +5,7 @@ from .application import db, meetup from .auth import login_required from .forms import GroupForm, MembershipForm +from .messaging import send_message from studygroup.exceptions import FormValidationException studygroup = Blueprint("studygroup", __name__, static_folder='static') @@ -106,13 +107,11 @@ def send_message(member_id): member = meetup.get('2/member/%s' % member_id) return render_template("send_message.html", member=member.data) elif request.method == 'POST': - response = meetup.post( - '2/message', - data={ - 'subject': request.form['subject'], - 'message': request.form['message'], - 'member_id': request.form['member_id'] - }) + response = send_message( + request.form['subject'], + request.form['member_id'], + request.form['message'] + ) return jsonify(response.data) else: return "Invalid Request", 500 diff --git a/tests/test_membership.py b/tests/test_membership.py index 1ac1e29..d7d0393 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -3,7 +3,7 @@ from studygroup.exceptions import GroupFullException, MembershipException from studygroup.forms import MembershipForm from studygroup.application import db -from studygroup.models import Group, Membership +from studygroup.models import Group, Membership, User, ROLE_GROUP_LEADER from tests.tools import StudyGroupTestCase import mock @@ -16,7 +16,22 @@ def setUp(self): name='group name', description='description' ) + + self.leader = User( + meetup_member_id=1001, + full_name='Leader', + is_admin=False + ) + + self.leader_membership = Membership( + user=self.leader, + group=self.group, + role=ROLE_GROUP_LEADER + ) + db.session.add(self.group) + db.session.add(self.leader) + db.session.add(self.leader_membership) db.session.commit() @@ -54,7 +69,7 @@ def test_show_group_post(self): member = Membership.by_group_and_user_ids(self.group.id, self.alice_id) self.assertIsNotNone(member) self.assert200(resp) - self.assertIn('Members: 1', resp.data) + self.assertIn('Members: 2', resp.data) def test_bad_group(self): self.login(self.alice_id) @@ -135,29 +150,42 @@ def test_validate_group_id(self, by_id_with_memberships): form._validate_existing_member.assert_called_with(7, 23) by_id_with_memberships.assert_called_with('FormData') - @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') + @mock.patch('studygroup.forms.Membership') @mock.patch('studygroup.forms.Group.by_id_with_memberships') @mock.patch('studygroup.forms.db.session') - def test_save(self, session, by_id_with_memberships, by_group_and_user_ids): + @mock.patch('studygroup.forms.send_join_notification') + def test_save(self, send_join_notification, session, by_id_with_memberships, membership): + + user = mock.Mock(name='user') + new_membership = mock.Mock(name='new membership', user=user) + membership.return_value = new_membership + group = mock.Mock(name='group', id=7) group.is_full.return_value = False by_id_with_memberships.return_value = group - by_group_and_user_ids.return_value = None + membership.by_group_and_user_ids.return_value = None + + leader = mock.Mock() + leader_membership = mock.Mock(name='leader', user=leader) + + membership.by_group_leader.return_value = leader_membership form = MembershipForm(23) form.group_id.data = 88 form.save() by_id_with_memberships.assert_called_with(88) - by_group_and_user_ids.assert_called_with(7, 23) + membership.by_group_and_user_ids.assert_called_with(7, 23) self.assertTrue(session.add.called) self.assertTrue(session.commit.called) + send_join_notification.assert_called_with(leader, user, group) @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') @mock.patch('studygroup.forms.Group.by_id_with_memberships') @mock.patch('studygroup.forms.db.session') - def test_save_full_group(self, session, by_id_with_memberships, by_group_and_user_ids): + @mock.patch('studygroup.forms.send_join_notification') + def test_save_full_group(self, send_join_notification, session, by_id_with_memberships, by_group_and_user_ids): group = mock.Mock(name='group', id=7) group.is_full.return_value = True by_id_with_memberships.return_value = group @@ -167,11 +195,13 @@ def test_save_full_group(self, session, by_id_with_memberships, by_group_and_use self.assertFalse(session.add.called) self.assertFalse(session.commit.called) + self.assertFalse(send_join_notification.called) @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') @mock.patch('studygroup.forms.Group.by_id_with_memberships') @mock.patch('studygroup.forms.db.session') - def test_save_member(self, session, by_id_with_memberships, by_group_and_user_ids): + @mock.patch('studygroup.forms.send_join_notification') + def test_save_member(self, send_join_notification, session, by_id_with_memberships, by_group_and_user_ids): group = mock.Mock(name='group', id=7) group.is_full.return_value = False by_id_with_memberships.return_value = group @@ -182,6 +212,7 @@ def test_save_member(self, session, by_id_with_memberships, by_group_and_user_id self.assertFalse(session.add.called) self.assertFalse(session.commit.called) + self.assertFalse(send_join_notification.called) class MembershipModelTest(GroupBaseTestCase): diff --git a/tests/tools.py b/tests/tools.py index ee23776..62d2bff 100644 --- a/tests/tools.py +++ b/tests/tools.py @@ -6,6 +6,7 @@ import flask.ext.migrate from flask.ext.testing import TestCase +import mock from studygroup.application import create_app, db from studygroup.models import User @@ -19,12 +20,21 @@ class StudyGroupTestCase(TestCase): Base class for all StudyGroup tests. """ def setUp(self): + # If a test needs to send messages the class must define send_messages True + # Otherwise no test should send messages. + if not getattr(self, 'send_messages', False): + self.patcher = mock.patch('studygroup.messaging.meetup.post', spec=True) + self.patcher.start() + flask.ext.migrate.upgrade() self.alice_id = self.create_user(full_name='Alice B.') self.admin_id = self.create_user(full_name='Bob Admin', is_admin=True) def tearDown(self): db.session.execute('DROP TABLE alembic_version') + if getattr(self, 'send_messages', False): + self.patcher.stop() + db.session.remove() db.drop_all() From db038bf9a8d199769074e6fd8efc7f20df3f0f51 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 3 Aug 2014 21:47:43 -0400 Subject: [PATCH 05/17] no leader no message --- studygroup/forms.py | 11 ++++++----- tests/test_membership.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/studygroup/forms.py b/studygroup/forms.py index aacb2e8..a303d38 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -86,10 +86,11 @@ def save(self): db.session.commit() leader_membership = Membership.by_group_leader(group.id) - send_join_notification( - leader_membership.user, - membership.user, - group - ) + if leader_membership: + send_join_notification( + leader_membership.user, + membership.user, + group + ) return membership diff --git a/tests/test_membership.py b/tests/test_membership.py index d7d0393..f3abeee 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -150,6 +150,34 @@ def test_validate_group_id(self, by_id_with_memberships): form._validate_existing_member.assert_called_with(7, 23) by_id_with_memberships.assert_called_with('FormData') + + @mock.patch('studygroup.forms.Membership') + @mock.patch('studygroup.forms.Group.by_id_with_memberships') + @mock.patch('studygroup.forms.db.session') + @mock.patch('studygroup.forms.send_join_notification') + def test_save_no_leader(self, send_join_notification, session, by_id_with_memberships, membership): + user = mock.Mock(name='user') + new_membership = mock.Mock(name='new membership', user=user) + membership.return_value = new_membership + + group = mock.Mock(name='group', id=7) + group.is_full.return_value = False + by_id_with_memberships.return_value = group + membership.by_group_and_user_ids.return_value = None + + membership.by_group_leader.return_value = None + form = MembershipForm(23) + form.group_id.data = 88 + + form.save() + + by_id_with_memberships.assert_called_with(88) + membership.by_group_and_user_ids.assert_called_with(7, 23) + + self.assertTrue(session.add.called) + self.assertTrue(session.commit.called) + self.assertFalse(send_join_notification.called) + @mock.patch('studygroup.forms.Membership') @mock.patch('studygroup.forms.Group.by_id_with_memberships') @mock.patch('studygroup.forms.db.session') From 016e46caa66172e7599d8e7430a9333f47a3d9ae Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 3 Aug 2014 22:23:18 -0400 Subject: [PATCH 06/17] adding support for a list of leaders --- studygroup/forms.py | 17 +++++++++-------- studygroup/models.py | 2 +- tests/test_membership.py | 23 +++++++++++++++++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/studygroup/forms.py b/studygroup/forms.py index a303d38..098843d 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -84,13 +84,14 @@ def save(self): db.session.add(membership) db.session.commit() - leader_membership = Membership.by_group_leader(group.id) - - if leader_membership: - send_join_notification( - leader_membership.user, - membership.user, - group - ) + leader_memberships = Membership.by_group_leader(group.id) + + if leader_memberships: + for leader_membership in leader_memberships: + send_join_notification( + leader_membership.user, + membership.user, + group + ) return membership diff --git a/studygroup/models.py b/studygroup/models.py index 8e2b5da..e26435e 100644 --- a/studygroup/models.py +++ b/studygroup/models.py @@ -40,7 +40,7 @@ def by_group_leader(cls, group_id): return Membership.query.filter_by( group_id=group_id, role=ROLE_GROUP_LEADER - ).first() + ).all() class Group(db.Model): id = db.Column(db.Integer, primary_key=True) diff --git a/tests/test_membership.py b/tests/test_membership.py index f3abeee..e2f6144 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -196,7 +196,10 @@ def test_save(self, send_join_notification, session, by_id_with_memberships, mem leader = mock.Mock() leader_membership = mock.Mock(name='leader', user=leader) - membership.by_group_leader.return_value = leader_membership + leader2 = mock.Mock() + leader_membership2 = mock.Mock(name='leader', user=leader2) + + membership.by_group_leader.return_value = [leader_membership, leader_membership2] form = MembershipForm(23) form.group_id.data = 88 @@ -207,7 +210,12 @@ def test_save(self, send_join_notification, session, by_id_with_memberships, mem self.assertTrue(session.add.called) self.assertTrue(session.commit.called) - send_join_notification.assert_called_with(leader, user, group) + + calls = [ + mock.call(leader, user, group), + mock.call(leader2, user, group) + ] + send_join_notification.assert_has_calls(calls, any_order=True) @mock.patch('studygroup.forms.Membership.by_group_and_user_ids') @mock.patch('studygroup.forms.Group.by_id_with_memberships') @@ -260,3 +268,14 @@ def test_group_user(self): def test_group_user_not_found(self): actual = Membership.by_group_and_user_ids(self.group.id, self.alice_id,) self.assertIsNone(actual) + + def test_by_group_leader_no_leader(self): + db.session.delete(self.leader_membership) + db.session.commit() + + actual = Membership.by_group_leader(self.group.id) + self.assertEqual(actual, []) + + def test_by_group_leader(self): + actual = Membership.by_group_leader(self.group.id) + self.assertEqual(actual, [self.leader_membership]) From 0fb0180e6e60e53b432c4b970a14e830dbc624b3 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Fri, 15 Jan 2016 21:45:01 -0500 Subject: [PATCH 07/17] fixing tests --- tests/tools.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tools.py b/tests/tools.py index 62d2bff..288ec83 100644 --- a/tests/tools.py +++ b/tests/tools.py @@ -20,6 +20,9 @@ class StudyGroupTestCase(TestCase): Base class for all StudyGroup tests. """ def setUp(self): + # Remove if something is created + db.session.remove() + db.drop_all() # If a test needs to send messages the class must define send_messages True # Otherwise no test should send messages. if not getattr(self, 'send_messages', False): From 1e02d963933619b16755a7bb061a147b73f3a4e7 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 7 Feb 2016 15:41:50 -0500 Subject: [PATCH 08/17] adding gulp removing bootstrap-flask --- .bowerrc | 3 + .gitignore | 7 ++ README.md | 21 +++- .../css/jumbotron-narrow.css | 2 +- bower.json | 20 ++++ gulpfile.js | 100 ++++++++++++++++++ package.json | 19 ++++ requirements.txt | 1 - settings.py | 1 + studygroup/templates/base.html | 45 ++++++++ studygroup/templates/groups.html | 8 +- studygroup/templates/index.html | 8 +- studygroup/templates/members.html | 8 +- studygroup/templates/new_group.html | 17 +-- studygroup/templates/show_group.html | 10 +- studygroup/templates/wtf_macro.html | 64 +++++++++++ 16 files changed, 288 insertions(+), 46 deletions(-) create mode 100644 .bowerrc rename {studygroup/static => assets}/css/jumbotron-narrow.css (99%) create mode 100644 bower.json create mode 100644 gulpfile.js create mode 100644 package.json create mode 100644 studygroup/templates/base.html create mode 100644 studygroup/templates/wtf_macro.html diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..cbd5f5d --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory" : "assets/bower_components" +} diff --git a/.gitignore b/.gitignore index 156e009..479453a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,10 @@ settings_local.py* # PyCharm .idea + +# dev assets +studygroup/static +assets/bower_components/ + +# node modules +node_modules/ diff --git a/README.md b/README.md index 2174f4c..a1930e0 100644 --- a/README.md +++ b/README.md @@ -36,15 +36,30 @@ development machine so that it pretends to be $ python manage.py db upgrade -5. Start the server: +5. Install The javascript builder: + Depending on your operating system install the npm package + (OSX) $ + * Brew + - $ brew install npm + * Mac Ports + - $ port install npm + + (Linux) + $ apt-get install npm + + $ npm install + $ bower install + $ gulp + +6. Start the server: $ python run_server.py -p 8080 -6. Visit the page in your browser using the URL http://localhost:8080. +7. Visit the page in your browser using the URL http://localhost:8080. You should see the Study Group page, and your server window should show URLs being served. -7. If you click the Sign In Now button, it should take you to meetup.com and +8. If you click the Sign In Now button, it should take you to meetup.com and ask you to authorize Boston Python Study Groups. diff --git a/studygroup/static/css/jumbotron-narrow.css b/assets/css/jumbotron-narrow.css similarity index 99% rename from studygroup/static/css/jumbotron-narrow.css rename to assets/css/jumbotron-narrow.css index 8379e16..ae7a83f 100644 --- a/studygroup/static/css/jumbotron-narrow.css +++ b/assets/css/jumbotron-narrow.css @@ -76,4 +76,4 @@ body { .jumbotron { border-bottom: 0; } -} \ No newline at end of file +} diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..bb0a6a7 --- /dev/null +++ b/bower.json @@ -0,0 +1,20 @@ +{ + "name": "studygroup", + "version": "0.0.0", + "license": "MIT", + "authors": [ + "Boston Python" + ], + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components" + ], + "dependencies": { + "bootstrap": "~3.3.6", + "font-awesome": "~4.5.0", + "jquery": "~2.2.0", + "lodash": "~4.2.1" + } +} diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..aad02ac --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,100 @@ +var gulp = require("gulp"), + sourcemaps = require("gulp-sourcemaps"), + concat = require("gulp-concat"), + less = require('gulp-less'), + minifyCss = require('gulp-minify-css'), + uglify = require('gulp-uglifyjs'), + symlink = require('gulp-sym') + STATIC = 'studygroup/static'; + + +var LIBS_SCRIPTS = [ + 'assets/bower_components/jquery/dist/jquery.js', + 'assets/bower_components/bootstrap/dist/js/bootstrap.js', + 'assets/bower_components/lodash/lodash.min.js', +]; + +var LIBS_CSS = [ + 'assets/bower_components/font-awesome/css/font-awesome.css', + 'assets/bower_components/bootstrap/dist/css/bootstrap.css', + 'assets/css/*.css', +]; + +var LIBS_FONTS = [ + 'assets/bower_components/font-awesome/fonts/**.*', + 'assets/bower_components/bootstrap/fonts/**.*', + 'assets/fonts/*/**.*', +]; + +gulp.task("fonts", function () { + return gulp.src(LIBS_FONTS) + .pipe(gulp.dest(STATIC + '/fonts')); +}); + +gulp.task("lib-css", function () { + return gulp.src(LIBS_CSS) + .pipe(gulp.dest(STATIC + '/dev/css')); +}); + +gulp.task("lib-js", function () { + return gulp.src(LIBS_SCRIPTS) + .pipe(gulp.dest(STATIC + '/dev/js')); +}); + +gulp.task("js", function () { + return gulp.src("./assets/js/**/*.js") + .pipe(sourcemaps.init()) + .pipe(concat("app.js")) + .pipe(sourcemaps.write(".")) + .pipe(gulp.dest(STATIC + '/dev/js')); +}); + +gulp.task("img", function () { + return gulp.src("./frontend/img/*") + .pipe(gulp.dest(STATIC + '/img')); +}); + +gulp.task("less", function () { + return gulp.src('./assets/less/**/*.less') + .pipe(sourcemaps.init()) + .pipe(less()) + .pipe(sourcemaps.write()) + .pipe(gulp.dest(STATIC + '/dev/css')); +}); + +gulp.task('minify-css', function () { + return gulp.src(STATIC + '/dev/css/*.css') + .pipe(minifyCss({compatibility: 'ie8'})) + .pipe(concat('style.min.css')) + .pipe(gulp.dest(STATIC + '/dist')); +}); + +gulp.task('minify-jslibs', function () { + return gulp.src(LIBS_SCRIPTS) + .pipe(uglify()) + .pipe(concat('libs.min.js')) + .pipe(gulp.dest(STATIC + '/dist')); +}); + +gulp.task('minify-js', function () { + return gulp.src(STATIC + '/dev/js/app.js') + .pipe(uglify()) + .pipe(concat('app.min.js')) + .pipe(gulp.dest(STATIC + '/dist')); +}); + +gulp.task('dev-link', function () { + return gulp.src([STATIC+'/fonts']) + .pipe(symlink([STATIC+'/dev/fonts'])); +}); + +gulp.task("default", ["js", "less", "img", "fonts", "lib-css", "lib-js", "dev-link"]); + +gulp.task('watch', function () { + gulp.watch('./assets/less/**/*.less', ['less']); + gulp.watch('./assets/js/**/*.js', ['js']); + gulp.watch('./assets/img/*', ['img']); + gulp.watch(LIBS_FONTS, ['fonts']); + gulp.watch(LIBS_CSS, ['fonts']); + gulp.watch(LIBS_SCRIPTS, ['fonts']); +}); diff --git a/package.json b/package.json new file mode 100644 index 0000000..28b3c95 --- /dev/null +++ b/package.json @@ -0,0 +1,19 @@ +{ + "name": "studygroup", + "version": "0.1.0", + "description": "The studygroup js build", + "devDependencies": {}, + "author": "Boston Python", + "dependencies": { + "bower": "^1.4.1", + "gulp": "^3.9.0", + "gulp-less": "^3.0.5", + "gulp-concat": "^2.6.0", + "gulp-sourcemaps": "^1.6.0", + "gulp-uglify": "^1.5.2", + "gulp-html-replace": "^1.5.5", + "gulp-minify-css": "^1.2.3", + "gulp-uglifyjs": "^0.6.2", + "gulp-sym": "^0.0.14 " + } +} diff --git a/requirements.txt b/requirements.txt index 050ac7e..b56d502 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -Flask-Bootstrap==3.1.0.1 Flask-Migrate==1.2.0 Flask-OAuthlib==0.4.2 Flask-SQLAlchemy==1.0 diff --git a/settings.py b/settings.py index b93634d..43d879d 100644 --- a/settings.py +++ b/settings.py @@ -7,6 +7,7 @@ SQLALCHEMY_DATABASE_URI = get('SQLALCHEMY_DATABASE_URI') DEFAULT_MAX_MEMBERS = 10 +WEBPACK_MANIFEST_PATH = "/Users/mmilkin/code/studygroup/manifest.json" # import local config to override global config try: diff --git a/studygroup/templates/base.html b/studygroup/templates/base.html new file mode 100644 index 0000000..75ac786 --- /dev/null +++ b/studygroup/templates/base.html @@ -0,0 +1,45 @@ +{% block doc -%} + + +{%- block html %} + + {%- block head %} + {% block title %}{% endblock title %} + + {%- block metas %} + + {%- endblock metas %} + + {%- block fonts %} + {%- endblock fonts %} + + {%- block styles %} + + + + {%- endblock styles %} + + {%- block scripts %} + + + {% endblock scripts -%} + + {%- endblock head %} + + + {% block body -%} + + {% block navbar %} + {%- endblock navbar %} + + {% block content -%} + {%- endblock content %} + + {% block body_scripts %} + {%- endblock body_scripts %} + + {%- endblock body %} + +{%- endblock html %} + +{% endblock doc -%} diff --git a/studygroup/templates/groups.html b/studygroup/templates/groups.html index b4db375..10f6304 100644 --- a/studygroup/templates/groups.html +++ b/studygroup/templates/groups.html @@ -1,12 +1,6 @@ -{% extends "bootstrap/base.html" %} +{% extends "base.html" %} {% block title %}Studygroup | Groups{% endblock %} -{% block styles %} -{{super()}} - -{% endblock %} - {% block content %}
diff --git a/studygroup/templates/index.html b/studygroup/templates/index.html index d2d2041..2d43cea 100644 --- a/studygroup/templates/index.html +++ b/studygroup/templates/index.html @@ -1,12 +1,6 @@ -{% extends "bootstrap/base.html" %} +{% extends "base.html" %} {% block title %}Studygroup | a Boston Python Project{% endblock %} -{% block styles %} -{{super()}} - -{% endblock %} - {% block content %}
diff --git a/studygroup/templates/members.html b/studygroup/templates/members.html index 4318d03..482cc34 100644 --- a/studygroup/templates/members.html +++ b/studygroup/templates/members.html @@ -1,12 +1,6 @@ -{% extends "bootstrap/base.html" %} +{% extends "base.html" %} {% block title %}Studygroup | Members{% endblock %} -{% block styles %} -{{super()}} - -{% endblock %} - {% block content %}
diff --git a/studygroup/templates/new_group.html b/studygroup/templates/new_group.html index 800cd7b..f0047d6 100644 --- a/studygroup/templates/new_group.html +++ b/studygroup/templates/new_group.html @@ -1,13 +1,7 @@ -{% extends "bootstrap/base.html" %} -{% import "bootstrap/wtf.html" as wtf %} +{% extends "base.html" %} +{% import "wtf_macro.html" as wtf %} {% block title %}Studygroup | Groups{% endblock %} -{% block styles %} -{{super()}} - -{% endblock %} - {% block content %}
@@ -30,10 +24,9 @@

New Group

{{ form.hidden_tag() }} - {{ wtf.form_errors(form, hiddens="only") }} - {{ wtf.form_field(form.name) }} - {{ wtf.form_field(form.description) }} - {{ wtf.form_field(form.max_members) }} + {{ wtf.render_field(form.name) }} + {{ wtf.render_field(form.description) }} + {{ wtf.render_field(form.max_members) }}
diff --git a/studygroup/templates/show_group.html b/studygroup/templates/show_group.html index b0652e8..1e2f09c 100644 --- a/studygroup/templates/show_group.html +++ b/studygroup/templates/show_group.html @@ -1,13 +1,7 @@ -{% extends "bootstrap/base.html" %} -{% import "bootstrap/wtf.html" as wtf %} +{% extends "base.html" %} +{% import "wtf_macro.html" as wtf %} {% block title %}Studygroup | Groups{% endblock %} -{% block styles %} -{{super()}} - -{% endblock %} - {% block content %}
diff --git a/studygroup/templates/wtf_macro.html b/studygroup/templates/wtf_macro.html new file mode 100644 index 0000000..2b84741 --- /dev/null +++ b/studygroup/templates/wtf_macro.html @@ -0,0 +1,64 @@ +{% macro render_field(field) -%} + {% set with_label = kwargs.pop('with_label', False) %} + {% set placeholder = '' %} + {% if not with_label %} + {% set placeholder = field.label.text %} + {% endif %} +
+ {% if with_label %} + + {% endif %} + + {% set class_ = kwargs.pop('class_', '') %} + {% if field.flags.required %} + {% set class_ = class_ + ' required' %} + {% endif %} + + {% if field.type == 'BooleanField' %} +
+ +
+ + {% else %} + + {% if field.type in ('TextField', 'TextAreaField', 'PasswordField') %} + {% set class_ = class_ + ' input-xlarge form-control' %} + + {% elif field.type == 'FileField' %} + {% set class_ = class_ + ' input-file form-control' %} + {% endif %} + + {% if field.type == 'SelectField' %} + {{ field(class_=class_, **kwargs) }} + {% else %} + + {{ field(class_=class_, placeholder=placeholder, **kwargs) }} + {% endif %} + + {% endif %} + {% if field.errors %} + {{ field.errors|join(', ') }} + {% endif %} + {% if field.description %} +

{{ field.description|safe }}

+ {% endif %} +
+{%- endmacro %} + +{% macro form_errors(form, hiddens=True) %} + {%- if form.errors %} + {%- for fieldname, errors in form.errors.items() %} + {%- if bootstrap_is_hidden_field(form[fieldname]) and hiddens or + not bootstrap_is_hidden_field(form[fieldname]) and hiddens != 'only' %} + {%- for error in errors %} +

{{error}}

+ {%- endfor %} + {%- endif %} + {%- endfor %} + {%- endif %} +{%- endmacro %} From 7cbd2a1d9a7c97cb13c5239b213e2c14bd939eea Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Mon, 8 Feb 2016 21:52:34 -0500 Subject: [PATCH 09/17] travis --- .gitignore | 3 +++ .travis.yml | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.gitignore b/.gitignore index 479453a..6670a62 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,6 @@ assets/bower_components/ # node modules node_modules/ + +# test db +test.db diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7097bb0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: python +python: + - "2.7" +install: + - "pip install -r requirements.txt" +script: + - "python -m unittest discover" From e88a2f7e50e2a167ea4bbe40ff199775db089456 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sat, 6 Feb 2016 13:56:02 -0500 Subject: [PATCH 10/17] adding groups --- migrations/versions/16f11fc2c7e4_.py | 26 +++++++++ studygroup/application.py | 3 +- studygroup/auth.py | 2 +- studygroup/forms.py | 9 +++- studygroup/groups.py | 81 ++++++++++++++++++++++++++++ studygroup/models.py | 24 ++++++++- studygroup/templates/groups.html | 12 ++--- studygroup/templates/index.html | 26 ++------- studygroup/templates/members.html | 6 +-- studygroup/templates/new_group.html | 6 +-- studygroup/templates/show_group.html | 2 +- studygroup/views.py | 60 +++------------------ 12 files changed, 164 insertions(+), 93 deletions(-) create mode 100644 migrations/versions/16f11fc2c7e4_.py create mode 100644 studygroup/groups.py diff --git a/migrations/versions/16f11fc2c7e4_.py b/migrations/versions/16f11fc2c7e4_.py new file mode 100644 index 0000000..48d9ad6 --- /dev/null +++ b/migrations/versions/16f11fc2c7e4_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: 16f11fc2c7e4 +Revises: 9975799c2b8 +Create Date: 2016-02-02 19:24:50.744280 + +""" + +# revision identifiers, used by Alembic. +revision = '16f11fc2c7e4' +down_revision = '9975799c2b8' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.add_column('group', sa.Column('start_date', sa.Date)) + op.add_column('group', sa.Column('start_time', sa.Time)) + op.add_column('group', sa.Column('active', sa.Boolean)) + + +def downgrade(): + op.drop_column('group', 'start_date') + op.drop_column('group', 'start_time') + op.drop_column('group', 'active') diff --git a/studygroup/application.py b/studygroup/application.py index 800c472..edf2900 100644 --- a/studygroup/application.py +++ b/studygroup/application.py @@ -14,13 +14,14 @@ def create_app(debug=True): from views import studygroup - + from groups import groups app = Flask(__name__) app.debug = debug app.secret_key = 'development' app.config.from_object(settings) app.register_blueprint(studygroup) + app.register_blueprint(groups) Bootstrap(app) db.init_app(app) diff --git a/studygroup/auth.py b/studygroup/auth.py index 5641f6a..3d438a5 100644 --- a/studygroup/auth.py +++ b/studygroup/auth.py @@ -5,7 +5,7 @@ def login_required(f): @wraps(f) def decorated_function(*args, **kwargs): - if g.user is None: + if getattr(g, 'user', None) is None: return redirect(url_for('studygroup.login', next=request.url)) return f(*args, **kwargs) return decorated_function diff --git a/studygroup/forms.py b/studygroup/forms.py index 098843d..d9e0244 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -1,6 +1,6 @@ from flask import g from flask_wtf import Form -from wtforms import TextField, TextAreaField, IntegerField, ValidationError +from wtforms import TextField, TextAreaField, DateField, IntegerField, ValidationError, DateTimeField, BooleanField from wtforms.validators import DataRequired from wtforms.widgets import HiddenInput @@ -14,12 +14,17 @@ class GroupForm(Form): name = TextField('Name', validators=[DataRequired()]) description = TextAreaField('Description', validators=[DataRequired()]) max_members = TextField('Max Members', validators=[DataRequired()]) + max_members = TextField('Max Members', validators=[DataRequired()]) + start_date = DateField('Starts At', format='%m/%d/%Y', validators=[DataRequired()]) + active = BooleanField('Active?', default=False, validators=[DataRequired()]) def save(self): + import ipdb; ipdb.set_trace() group = Group( name=self.name.data, description=self.description.data, - max_members=self.max_members.data + max_members=self.max_members.data, + active = self.active ) membership = Membership( diff --git a/studygroup/groups.py b/studygroup/groups.py new file mode 100644 index 0000000..b874aab --- /dev/null +++ b/studygroup/groups.py @@ -0,0 +1,81 @@ +from flask import (g, request, redirect, render_template, + session, url_for, Blueprint) + +from .models import Group, Membership, User +from .auth import login_required +from .forms import GroupForm, MembershipForm +from studygroup.exceptions import FormValidationException + + +groups = Blueprint("group", __name__, static_folder='static') + +@groups.before_request +def load_user(): + user_id = session.get('user_id') + if user_id: + g.user = User.query.filter_by(id=user_id).first() + else: + g.user = None + +def _show_group_post(group): + form = MembershipForm(session.get('user_id')) + if form.validate_on_submit(): + try: + form.save() + except FormValidationException as e: + form.form_errors = e.message + return render_show_group(group, form) + + +def render_show_group(group, form=None): + if not form: + user_id = session.get('user_id') + membership = Membership( + user_id=user_id, + group_id=group.id + ) + form = MembershipForm(user_id, obj=membership) + + return render_template('show_group.html', form=form) + + +@groups.route('/join_group', methods=('POST',)) +def join_group(): + pass + + +def render_show_group(group, form=None): + if not form: + user_id = session.get('user_id') + membership = Membership( + user_id=user_id, + group_id=group.id + ) + form = MembershipForm(user_id, obj=membership) + + return render_template('show_group.html', form=form) + + +@groups.route('/group/new', methods=('GET', 'POST')) +def new_group(): + form = GroupForm() + if form.validate_on_submit(): + group = form.save() + return redirect(url_for('.show_group', id=group.id)) + return render_template('new_group.html', form=form) + + +@groups.route('/groups') +@login_required +def show_groups(): + g.groups = Group.all_with_memberships() + return render_template('groups.html') + +@groups.route('/group/', methods=('POST', 'GET')) +@login_required +def show_group(id): + g.group = Group.query.filter_by(id=id).first() + if request.method == 'POST': + return _show_group_post(id) + else: + return render_show_group(g.group) diff --git a/studygroup/models.py b/studygroup/models.py index e26435e..d552110 100644 --- a/studygroup/models.py +++ b/studygroup/models.py @@ -1,6 +1,7 @@ """ Data models for StudyGroups """ +import datetime from sqlalchemy import UniqueConstraint from .application import db @@ -9,6 +10,7 @@ ROLE_MEMBER = 1 ROLE_GROUP_LEADER = 10 + class User(db.Model): id = db.Column(db.Integer, primary_key=True) meetup_member_id = db.Column(db.String, unique=True) @@ -46,8 +48,26 @@ class Group(db.Model): id = db.Column(db.Integer, primary_key=True) name = db.Column(db.String, unique=True) description = db.Column(db.String) - max_members = db.Column(db.Integer, nullable=False, - default=settings.DEFAULT_MAX_MEMBERS) + max_members = db.Column( + db.Integer, nullable=False, + default=settings.DEFAULT_MAX_MEMBERS + ) + + start_date = db.Column( + db.Date, + nullable=False + ) + + start_time = db.Column( + db.Time, nullable=False, + default=datetime.time(hour=18) + ) + + active = db.Column( + db.Boolean, + nullable=False, + default=False + ) memberships = db.relationship("Membership", backref="group") diff --git a/studygroup/templates/groups.html b/studygroup/templates/groups.html index 10f6304..2eb39b7 100644 --- a/studygroup/templates/groups.html +++ b/studygroup/templates/groups.html @@ -5,11 +5,11 @@

Studygroup

@@ -17,18 +17,18 @@

Studygroup

Groups New Group +

+ href="{{ url_for('group.new_group') }}">New Group +
{% for group in g.groups %} -

{{ group.name }}

+

{{ group.name }}

Members: {{ group.memberships | length }}

{{ group.description }}

{% else %}

No groups

- Propose a Study Group {% endfor %} diff --git a/studygroup/templates/index.html b/studygroup/templates/index.html index 2d43cea..562bce4 100644 --- a/studygroup/templates/index.html +++ b/studygroup/templates/index.html @@ -6,10 +6,10 @@

Studygroup

@@ -25,7 +25,7 @@

Studygroup

{% if not g.user %}

Sign In Now

{% else %} @@ -37,7 +37,7 @@

Studygroup

-

Subheading

+

Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

@@ -53,22 +53,6 @@

Subheading

magna.

-
-

Subheading

- -

Donec id elit non mi porta gravida at eget metus. Maecenas - faucibus mollis interdum.

- -

Subheading

- -

Morbi leo risus, porta ac consectetur ac, vestibulum at eros. - Cras mattis consectetur purus sit amet fermentum.

- -

Subheading

- -

Maecenas sed diam eget risus varius blandit sit amet non - magna.

-
diff --git a/studygroup/templates/members.html b/studygroup/templates/members.html index 482cc34..9b58c70 100644 --- a/studygroup/templates/members.html +++ b/studygroup/templates/members.html @@ -5,11 +5,11 @@

Studygroup

diff --git a/studygroup/templates/new_group.html b/studygroup/templates/new_group.html index f0047d6..003e6f8 100644 --- a/studygroup/templates/new_group.html +++ b/studygroup/templates/new_group.html @@ -6,11 +6,11 @@

Studygroup

diff --git a/studygroup/templates/show_group.html b/studygroup/templates/show_group.html index 1e2f09c..ff6cbbd 100644 --- a/studygroup/templates/show_group.html +++ b/studygroup/templates/show_group.html @@ -7,7 +7,7 @@
  • Home
    • -
  • Groups
    • +
  • Groups
  • Members
    • {% if g.user %}
  • Logout
    • diff --git a/studygroup/views.py b/studygroup/views.py index d5f9ba6..54ad247 100644 --- a/studygroup/views.py +++ b/studygroup/views.py @@ -1,15 +1,14 @@ from flask import (g, request, redirect, render_template, session, url_for, jsonify, Blueprint) -from .models import User, Group, Membership +from .models import User, Group from .application import db, meetup from .auth import login_required -from .forms import GroupForm, MembershipForm from .messaging import send_message -from studygroup.exceptions import FormValidationException studygroup = Blueprint("studygroup", __name__, static_folder='static') + @studygroup.before_request def load_user(): user_id = session.get('user_id') @@ -21,54 +20,9 @@ def load_user(): @studygroup.route('/') def index(): - return render_template('index.html') - -@studygroup.route('/groups') -@login_required -def show_groups(): - g.groups = Group.all_with_memberships() - return render_template('groups.html') - -@studygroup.route('/group/', methods=('POST', 'GET')) -@login_required -def show_group(id): - g.group = Group.query.filter_by(id=id).first() - if request.method == 'POST': - return _show_group_post(id) - else: - return render_show_group(g.group) - -def _show_group_post(group): - form = MembershipForm(session.get('user_id')) - if form.validate_on_submit(): - try: - form.save() - except FormValidationException as e: - form.form_errors = e.message - return render_show_group(group, form) - -def render_show_group(group, form=None): - if not form: - user_id = session.get('user_id') - membership = Membership( - user_id=user_id, - group_id=group.id - ) - form = MembershipForm(user_id, obj=membership) - - return render_template('show_group.html', form=form) - -@studygroup.route('/group/new', methods=('GET', 'POST')) -def new_group(): - form = GroupForm() - if form.validate_on_submit(): - group = form.save() - return redirect(url_for('.show_group', id=group.id)) - return render_template('new_group.html', form=form) - -@studygroup.route('/join_group', methods=('POST',)) -def join_group(): - pass + return render_template( + 'index.html', groups=Group.all_with_memberships() + ) @studygroup.route('/members') @@ -116,6 +70,7 @@ def send_message(member_id): else: return "Invalid Request", 500 + @studygroup.route('/boom') def boom(): raise Exception('BOOM') @@ -135,7 +90,7 @@ def logout(): @studygroup.route('/login/authorized') @meetup.authorized_handler def authorized(resp): - if resp is None: + if resp is None or not isinstance(resp, dict): return 'Access denied: reason=%s error=%s' % ( request.args['error_reason'], request.args['error_description'] @@ -154,7 +109,6 @@ def authorized(resp): ) db.session.add(user) db.session.commit() - session['user_id'] = user.id return redirect(url_for('.index')) From 16089f6256a27f508d932af29c0171a168e22512 Mon Sep 17 00:00:00 2001 From: Mike Milkin Date: Sun, 7 Feb 2016 22:43:38 -0500 Subject: [PATCH 11/17] adding group --- assets/js/app.js | 19 +++++++++++++++++++ bower.json | 4 +++- gulpfile.js | 3 +++ studygroup/forms.py | 10 +++++----- studygroup/templates/base.html | 4 ++++ studygroup/templates/new_group.html | 2 ++ studygroup/templates/show_group.html | 6 +++--- studygroup/templates/wtf_macro.html | 20 +++++++++++++------- tests/test_app.py | 14 +++++++++++--- tests/test_membership.py | 14 +++++++------- 10 files changed, 70 insertions(+), 26 deletions(-) create mode 100644 assets/js/app.js diff --git a/assets/js/app.js b/assets/js/app.js new file mode 100644 index 0000000..b6a882e --- /dev/null +++ b/assets/js/app.js @@ -0,0 +1,19 @@ +$(function () { + $('[data-provide="datepicker"]').datetimepicker({ + icons: { + date: "fa fa-calendar", + up: "fa fa-arrow-up", + down: "fa fa-arrow-down" + }, + format: 'DD/MM/YYYY' + }); + $('[data-provide="datetimepicker"]').datetimepicker({ + icons: { + time: "fa fa-clock-o", + date: "fa fa-calendar", + up: "fa fa-arrow-up", + down: "fa fa-arrow-down" + }, + format: 'DD/MM/YYYY HH:mm' + }); +}); diff --git a/bower.json b/bower.json index bb0a6a7..c8768e2 100644 --- a/bower.json +++ b/bower.json @@ -13,8 +13,10 @@ ], "dependencies": { "bootstrap": "~3.3.6", + "eonasdan-bootstrap-datetimepicker": "~4.17.0", "font-awesome": "~4.5.0", "jquery": "~2.2.0", - "lodash": "~4.2.1" + "lodash": "~4.2.1", + "moment": "~2.11.2" } } diff --git a/gulpfile.js b/gulpfile.js index aad02ac..e7a0599 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,11 +12,14 @@ var LIBS_SCRIPTS = [ 'assets/bower_components/jquery/dist/jquery.js', 'assets/bower_components/bootstrap/dist/js/bootstrap.js', 'assets/bower_components/lodash/lodash.min.js', + 'assets/bower_components/moment/min/moment.min.js', + 'assets/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' ]; var LIBS_CSS = [ 'assets/bower_components/font-awesome/css/font-awesome.css', 'assets/bower_components/bootstrap/dist/css/bootstrap.css', + 'assets/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css', 'assets/css/*.css', ]; diff --git a/studygroup/forms.py b/studygroup/forms.py index d9e0244..6e5e410 100644 --- a/studygroup/forms.py +++ b/studygroup/forms.py @@ -14,17 +14,17 @@ class GroupForm(Form): name = TextField('Name', validators=[DataRequired()]) description = TextAreaField('Description', validators=[DataRequired()]) max_members = TextField('Max Members', validators=[DataRequired()]) - max_members = TextField('Max Members', validators=[DataRequired()]) - start_date = DateField('Starts At', format='%m/%d/%Y', validators=[DataRequired()]) - active = BooleanField('Active?', default=False, validators=[DataRequired()]) + start_date = DateTimeField('Starts At', format='%m/%d/%Y %H:%M', validators=[DataRequired()]) + active = BooleanField('Active?', default=False) def save(self): - import ipdb; ipdb.set_trace() group = Group( name=self.name.data, description=self.description.data, max_members=self.max_members.data, - active = self.active + start_date=self.start_date.data.date(), + start_time=self.start_date.data.time(), + active=1 if self.active else 0 ) membership = Membership( diff --git a/studygroup/templates/base.html b/studygroup/templates/base.html index 75ac786..20de790 100644 --- a/studygroup/templates/base.html +++ b/studygroup/templates/base.html @@ -17,11 +17,15 @@ + {%- endblock styles %} {%- block scripts %} + + + {% endblock scripts -%} {%- endblock head %} diff --git a/studygroup/templates/new_group.html b/studygroup/templates/new_group.html index 003e6f8..f63aced 100644 --- a/studygroup/templates/new_group.html +++ b/studygroup/templates/new_group.html @@ -27,6 +27,8 @@

    New Group

    {{ wtf.render_field(form.name) }} {{ wtf.render_field(form.description) }} {{ wtf.render_field(form.max_members) }} + {{ wtf.render_field(form.start_date) }} + {{ wtf.render_field(form.active) }}
diff --git a/studygroup/templates/show_group.html b/studygroup/templates/show_group.html index ff6cbbd..10570b7 100644 --- a/studygroup/templates/show_group.html +++ b/studygroup/templates/show_group.html @@ -6,11 +6,11 @@

Studygroup

diff --git a/studygroup/templates/wtf_macro.html b/studygroup/templates/wtf_macro.html index 2b84741..1798480 100644 --- a/studygroup/templates/wtf_macro.html +++ b/studygroup/templates/wtf_macro.html @@ -4,7 +4,7 @@ {% if not with_label %} {% set placeholder = field.label.text %} {% endif %} -
+
{% if with_label %}