penyesuaian allow_area

opensipkd/models/user_area.py

@@ -17,10 +17,10 @@ class UserArea(DefaultModel, Base):
     @classmethod
     @classmethod
     def allow_area(cls, user_id, desa_id=None, desa_kd=None,
     def allow_area(cls, user_id, desa_id=None, desa_kd=None,
                    group_names=("Superuser", "pbbm-admin"), ):
                    group_names=("Superuser", "pbbm-admin"), ):
-        user = UserGroup.query().filter_by(user_id == user_id).outerjoin(
+        user = UserGroup.query().filter(user_id == user_id).outerjoin(
             Group, Group.id == UserGroup.group_id).filter(
             Group, Group.id == UserGroup.group_id).filter(
-            UserGroup.group_name._in(*group_names)).first()
-        if user and user.id:
+            Group.group_name.in_(group_names)).first()
+        if user and user.user_id:
             return True
             return True
 
 
         if desa_id:
         if desa_id:

opensipkd/models/users.py

@@ -34,6 +34,10 @@ class UserGroup(UserGroupMixin, Base, CommonModel):
     @classmethod
     @classmethod
     def _get_by_user(cls, user):
     def _get_by_user(cls, user):
         return DBSession.query(cls).filter_by(user_id=user.id).all()
         return DBSession.query(cls).filter_by(user_id=user.id).all()
+    
+    @classmethod
+    def query(cls):
+        return DBSession.query(cls)
 
 
     @classmethod
     @classmethod
     def get_by_user(cls, user):
     def get_by_user(cls, user):