From 11ece375f0b51d7850142c20e8194168688b3b03 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 5 Feb 2017 22:28:10 -0500
Subject: [PATCH] Remove groups for now, will rethink them

---
 git/blueprints/cgit.py  | 12 ++++++------
 git/types/__init__.py   |  1 -
 git/types/group.py      | 12 ------------
 git/types/repository.py |  4 +---
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 git/types/group.py

diff --git a/git/blueprints/cgit.py b/git/blueprints/cgit.py
index 48085d1..ed3294e 100644
--- a/git/blueprints/cgit.py
+++ b/git/blueprints/cgit.py
@@ -6,18 +6,18 @@ cgit = Blueprint('cgit', __name__)
 
 upstream = cfg("cgit", "remote")
 
-@cgit.route("/<user>/<repo>", defaults={ "cgit_path": "" })
-@cgit.route("/<user>/<repo>/", defaults={ "cgit_path": "" })
-@cgit.route("/<user>/<repo>/<path:cgit_path>")
+@cgit.route("/~<user>/<repo>", defaults={ "cgit_path": "" })
+@cgit.route("/~<user>/<repo>/", defaults={ "cgit_path": "" })
+@cgit.route("/~<user>/<repo>/<path:cgit_path>")
 def cgit_passthrough(user, repo, cgit_path):
     r = requests.get("{}/{}".format(upstream, request.full_path))
     return render_template("cgit.html",
             cgit_html=r.text,
-            owner_name=user,
+            owner_name="~" + user,
             repo_name=repo)
 
-@cgit.route("/<user>/<repo>/patch")
-@cgit.route("/<user>/<repo>/patch/")
+@cgit.route("/~<user>/<repo>/patch")
+@cgit.route("/~<user>/<repo>/patch/")
 def cgit_plain(user, repo):
     r = requests.get("{}/{}".format(upstream, request.full_path))
     return Response(r.text, mimetype="text/plain")
diff --git a/git/types/__init__.py b/git/types/__init__.py
index 48ed1cf..cafa4f1 100644
--- a/git/types/__init__.py
+++ b/git/types/__init__.py
@@ -1,3 +1,2 @@
 from .user import User
 from .repository import Repository
-from .group import Group
diff --git a/git/types/group.py b/git/types/group.py
deleted file mode 100644
index f365641..0000000
--- a/git/types/group.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import sqlalchemy as sa
-import sqlalchemy_utils as sau
-from srht.database import Base
-
-class Group(Base):
-    __tablename__ = 'group'
-    id = sa.Column(sa.Integer, primary_key=True)
-    created = sa.Column(sa.DateTime, nullable=False)
-    updated = sa.Column(sa.DateTime, nullable=False)
-    name = sa.Column(sa.Unicode(256), nullable=False)
-    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'), nullable=False)
-    owner = sa.orm.relationship('User', backref=sa.orm.backref('groups'))
diff --git a/git/types/repository.py b/git/types/repository.py
index ad46d43..06265e3 100644
--- a/git/types/repository.py
+++ b/git/types/repository.py
@@ -8,7 +8,5 @@ class Repository(Base):
     created = sa.Column(sa.DateTime, nullable=False)
     updated = sa.Column(sa.DateTime, nullable=False)
     name = sa.Column(sa.Unicode(256), nullable=False)
-    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'))
+    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'), nullable=False)
     owner = sa.orm.relationship('User', backref=sa.orm.backref('repos'))
-    group_id = sa.Column(sa.Integer, sa.ForeignKey('group.id'))
-    group = sa.orm.relationship('Group', backref=sa.orm.backref('repos'))
-- 
2.38.4