kallithea Changeset - 974d6470cbec

Changeset - 974d6470cbec

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Søren Løvborg - 9 years ago 2016-08-03 16:51:34
sorenl@unity3d.com

model: inline BaseModel.get_all

This is just needless indirection (and doesn't actually add any
abstraction on top of the database object), so inline all calls to it.

Don't touch PullRequestModel.get_all, though, since it is an entirely
unrelated method that just shadows the inherited get_all.

5 files changed with 9 insertions and 16 deletions:

kallithea/controllers/api/api.py

kallithea/model/__init__.py

kallithea/tests/api/api_base.py

kallithea/tests/fixture.py

kallithea/tests/models/test_user_groups.py

0 comments (0 inline, 0 general)

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ from kallithea.model.scm import ScmModel @@
 from kallithea.model.repo import RepoModel
 from kallithea.model.user import UserModel
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.gist import GistModel
 from kallithea.model.db import (
     Repository, Setting, UserIpMap, Permission, User, Gist,
     RepoGroup)
+    RepoGroup, UserGroup)
 from kallithea.lib.compat import json
 from kallithea.lib.exceptions import (
     DefaultUserException, UserGroupsAssignedException)
 log = logging.getLogger(__name__)
@@ @@ -882,13 +882,13 @@ class ApiController(JSONRPCController): @@
             error : null
         """
         result = []
         _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',)
         extras = {'user': apiuser}
-        for user_group in UserGroupList(UserGroupModel().get_all(),
+        for user_group in UserGroupList(UserGroup.get_all(),
                                         perm_set=_perms, extra_kwargs=extras):
             result.append(user_group.get_api_data())
         return result
     @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def create_user_group(self, apiuser, group_name, description=Optional(''),
@@ @@ -1320,13 +1320,13 @@ class ApiController(JSONRPCController): @@
             error:  null
         """
         result = []
         if not HasPermissionAnyApi('hg.admin')(user=apiuser):
             repos = RepoModel().get_all_user_repos(user=apiuser)
         else:
-            repos = RepoModel().get_all()
+            repos = Repository.get_all()
         for repo in repos:
             result.append(repo.get_api_data())
         return result
     # permission check inside

kallithea/model/__init__.py

➞

Show inline comments

@@ @@ -129,13 +129,6 @@ class BaseModel(object): @@
         :param permission: PermissionID, permission_name or Permission instance
         """
         from kallithea.model.db import Permission
         return self._get_instance(Permission, permission,
                                   callback=Permission.get_by_key)
     @classmethod
     def get_all(cls):
         """
         Returns all instances of what is defined in `cls` class variable
         """
         return cls.cls.get_all()

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -877,13 +877,13 @@ class _BaseTestApi(object): @@
     def test_api_get_repos(self):
         id_, params = _build_data(self.apikey, 'get_repos')
         response = api_call(self, params)
         result = []
-        for repo in RepoModel().get_all():
+        for repo in Repository.get_all():
             result.append(repo.get_api_data())
         ret = jsonify(result)
         expected = ret
         self._compare_ok(id_, expected, given=response.body)

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ @@
 """
 Helpers for fixture generation
 """
 import os
 import time
 from kallithea.tests import *
 from kallithea.model.db import Repository, User, RepoGroup, UserGroup
+from kallithea.model.db import Repository, User, RepoGroup, UserGroup, Gist
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.user import UserModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.gist import GistModel
@@ @@ -249,13 +249,13 @@ class Fixture(object): @@
+        )
         Session().commit()
         return gist
     def destroy_gists(self, gistid=None):
-        for g in GistModel.cls.get_all():
+        for g in Gist.get_all():
             if gistid:
                 if gistid == g.gist_access_id:
                     GistModel().delete(g)
             else:
                 GistModel().delete(g)
         Session().commit()

kallithea/tests/models/test_user_groups.py

➞

Show inline comments

 from kallithea.model.db import User
+from kallithea.model.db import User, UserGroup
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.meta import Session
@@ @@ -11,13 +11,13 @@ fixture = Fixture() @@
 class TestUserGroups(TestController):
     def teardown_method(self, method):
         # delete all groups
-        for gr in UserGroupModel.get_all():
+        for gr in UserGroup.get_all():
             fixture.destroy_user_group(gr)
         Session().commit()
     @parametrize('pre_existing,regular_should_be,external_should_be,groups,expected', [
         ([], [], [], [], []),
         ([], [u'regular'], [], [], [u'regular']),  # no changes of regular
@@ @@ -27,13 +27,13 @@ class TestUserGroups(TestController): @@
         ([], [u'regular'], [u'other'], [], [u'regular']),  # remove not used
         ([u'some_other'], [u'regular'], [u'other', u'container'], [u'container', u'container2'], [u'regular', u'container', u'container2']),
     ])
     def test_enforce_groups(self, pre_existing, regular_should_be,
                             external_should_be, groups, expected):
         # delete all groups
-        for gr in UserGroupModel.get_all():
+        for gr in UserGroup.get_all():
             fixture.destroy_user_group(gr)
         Session().commit()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         for gr in pre_existing:
             gr = fixture.create_user_group(gr)

0 comments (0 inline, 0 general)