From 0e1075a347fa37477959885ad77010d84fe43fe3 Mon Sep 17 00:00:00 2001
From: Anon Ray <rayanon004@gmail.com>
Date: Tue, 18 Feb 2014 18:38:26 +0530
Subject: [PATCH] Few changes in data members of classes

---
 group.py      |    2 --
 membership.py |    3 +++
 user.py       |    6 +-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/group.py b/group.py
index da80f4c..4ad0ec2 100644
--- a/group.py
+++ b/group.py
@@ -18,13 +18,11 @@ class Group(db.Model):
     created_by = db.Column(db.Integer, db.ForeignKey('users.id'))
 
     creator = db.relationship('User', backref='groups', lazy='dynamic')
-    memberships = db.relationship('Membership', backref='groups', lazy='dynamic')
 
     def __init__(self, name):
         self.name = name
 
 
-
     def persist(self):        # add record
         db.session.add(self)
         db.session.commit()
diff --git a/membership.py b/membership.py
index 0fe189a..51982ed 100644
--- a/membership.py
+++ b/membership.py
@@ -14,6 +14,9 @@ class Membership(db.Model):
     gid = db.Column(db.Integer, db.ForeignKey('groups.id'))
     created = db.Column(db.DateTime, default=datetime.utcnow)
 
+    user = db.relationship('User', backref='memberships', lazy='dynamic')
+    group = db.relationship('Group', backref='memberships', lazy='dynamic')
+
     def __init__(self, uid, gid):
         self.uid = uid
         self.gid = gid
diff --git a/user.py b/user.py
index 1fea4ab..724aaea 100644
--- a/user.py
+++ b/user.py
@@ -14,7 +14,6 @@ class User(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(80))
     email = db.Column(db.String(120), unique=True)
-    memberships = db.relationship('Membership', backref='user', lazy='dynamic')
     created = db.Column(db.DateTime, default=datetime.utcnow)
     last_active = db.Column(db.DateTime, default=datetime.utcnow)
 
@@ -35,19 +34,16 @@ class User(db.Model):
     def getByName(username):      #Query record by username
         tofind = User.query.filter_by(username=username).first()
         return tofind
-    
-    
+
     def persist(self):        #To create record
         db.session.add(self)
         db.session.commit()
 
-    
     def delete(self):            # To delete a record
         db.session.delete(self)
         db.session.commit()
 
 
-
     def __repr__(self):
         return '<User %r %r>' % (self.username, self.email)
 
-- 
1.7.10.4