unclaim mentorship

Author: raylu

db.py

@@ -18,11 +18,14 @@ def create_user(self, user):
 		yield self.execute(query, user['id'], user['login'], user['access_token'], 0)
 
 	@tornado.gen.coroutine
-	def create_mentorship(self, mentee, mentor):
-		mentee_claimed = yield self.get_mentor(mentee['github_id'])
-		if mentor['is_mentor'] and not mentee['is_mentor'] and not mentee_claimed:
-			query = 'INSERT INTO mentorships(mentee_id, mentor_id) VALUES (%s, %s);'
-			yield self.execute(query, mentee['github_id'], mentor['github_id'])
+	def create_mentorship(self, mentee_id, mentor_id):
+		query = 'INSERT INTO mentorships(mentee_id, mentor_id) VALUES (%s, %s);'
+		yield self.execute(query, mentee_id, mentor_id)
+
+	@tornado.gen.coroutine
+	def remove_mentorship(self, mentee_id, mentor_id):
+		query = 'DELETE FROM mentorships WHERE mentee_id = %s AND mentor_id = %s;'
+		yield self.execute(query, mentee_id, mentor_id)
 
 	@tornado.gen.coroutine
 	def update_access_token(self, user):

server.py

@@ -97,6 +97,28 @@ def get(self):
 		users = yield self.db.get_userlist()
 		self.render('users.html', users=users)
 
+class ClaimHandler(BaseHandler):
+	@tornado.web.authenticated
+	@tornado.gen.coroutine
+	def post(self, username):
+		if not self.current_user['is_mentor']:
+			raise tornado.web.HTTPError(403)
+		mentee = yield self.db.get_user_by('username', username)
+		if mentee['is_mentor']:
+			raise tornado.web.HTTPError(403)
+		yield self.db.create_mentorship(mentee['github_id'], self.current_user['github_id'])
+		self.redirect('/users/' + username)
+
+class UnclaimHandler(BaseHandler):
+	@tornado.web.authenticated
+	@tornado.gen.coroutine
+	def post(self, username):
+		if not self.current_user['is_mentor']:
+			raise tornado.web.HTTPError(403)
+		mentee = yield self.db.get_user_by('username', username)
+		yield self.db.remove_mentorship(mentee['github_id'], self.current_user['github_id'])
+		self.redirect('/users/' + username)
+
 class ProfileHandler(BaseHandler):
 	@tornado.gen.coroutine
 	def get(self, username):
@@ -111,16 +133,6 @@ def get(self, username):
 				questions, answers = yield self.db.get_questionnaire(user['github_id'])
 		self.render('profile.html', user=user, mentor=mentor, mentees=mentees, questions=questions, answers=answers)
 
-	@tornado.web.authenticated
-	@tornado.gen.coroutine
-	def post(self, username):
-		if not self.current_user['is_mentor']:
-			raise tornado.web.HTTPError(403)
-		mentee = yield self.db.get_user_by('username', username)
-		mentor = yield self.db.get_user(self.current_user['github_id'])
-		yield self.db.create_mentorship(mentee, mentor)
-		self.redirect('/users/' + username)
-
 class AccountHandler(BaseHandler):
 	@tornado.web.authenticated
 	@tornado.gen.coroutine
@@ -166,6 +178,8 @@ def get(self, css_path):
 			(r'/github_emails', GithubEmailsHandler),
 			(r'/logout', LogoutHandler),
 			(r'/users', UserListHandler),
+			(r'/users/(.*)/claim', ClaimHandler),
+			(r'/users/(.*)/unclaim', UnclaimHandler),
 			(r'/users/(.*)', ProfileHandler),
 			(r'/account', AccountHandler),
 			(r'/account/contact_info', ContactInfoHandler),

templates/profile.html

@@ -12,8 +12,14 @@ <h3>Mentees</h3>
 	{% else %}
 		{% if mentor %}
 			<h3>Mentor: <a href="{{ mentor['username'] }}">{{ mentor['username'] }}</a></h3>
+			{% if current_user and current_user['github_id'] == mentor['github_id'] %}
+				<form action="/users/{{ user['username'] }}/unclaim" method="post">
+					<input type="hidden" name="github_id" value="{{ user['github_id'] }}">
+					<input type="submit" value="Unclaim {{ user['username'] }}">
+				</form>
+			{% end %}
 		{% elif current_user['is_mentor'] %}
-			<form method="post">
+			<form action="/users/{{ user['username'] }}/claim" method="post">
 				<input type="hidden" name="github_id" value="{{ user['github_id'] }}">
 				<input type="submit" value="Claim {{ user['username'] }}">
 			</form>