nsarchive 2.0.0a2__tar.gz → 2.0.0a4__tar.gz

{nsarchive-2.0.0a2 → nsarchive-2.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 2.0.0a2
+Version: 2.0.0a4
 Summary: API-wrapper pour récupérer des données liées à Nation
 License: GPL-3.0
 Author: happex

{nsarchive-2.0.0a2 → nsarchive-2.0.0a4}/nsarchive/cls/base.py

@@ -37,7 +37,7 @@ class Instance:
     def __init__(self, client: Client):
         self.db = client
 
-    def _select_from_db(self, table: str, key: str, value: str) -> dict:
+    def _select_from_db(self, table: str, key: str, value: str) -> list:
         """
         Récupère des données JSON d'une table Supabase en fonction de l'ID.
 
@@ -112,11 +112,12 @@ class Instance:
         matches = []
 
         for key, value in query.items():
-            matches.append(self._select_from_db(table, key, value))
+            entity = self._select_from_db(table, key, value)
+            if entity is not None: matches.append(entity[0])
 
         _res = []
 
-        for item in matches[0]:
+        for item in matches:
             if all(item in sublist for sublist in matches[1:]):
                 _res.append(item)
 

{nsarchive-2.0.0a2 → nsarchive-2.0.0a4}/nsarchive/cls/entities.py

@@ -29,7 +29,7 @@ class PositionPermissions:
         self.vote_representatives = False # Participer aux élections législatives
 
     def edit(self, **permissions: bool) -> None:
-        for perm in permissions.values():
+        for perm in permissions.items():
             self.__setattr__(*perm)
 
 class Position:
@@ -141,7 +141,7 @@ class Organization(Entity):
         self.members: list[GroupMember] = []
 
         self.parts: dict[NSID, int] = {
-            self.owner.id: 1
+            self.id: 1
         }
 
     def add_certification(self, certification: str) -> None:

{nsarchive-2.0.0a2 → nsarchive-2.0.0a4}/nsarchive/instances/_entities.py

@@ -67,7 +67,7 @@ class EntityInstance(Instance):
 
             for _member in _data['members']:
                 member = GroupMember(_member['id'])
-                member.permission_level = _member['level']
+                member.permission_level = _member['position']
 
                 _member_profile = self.get_entity(member.id)
 
@@ -167,9 +167,10 @@ class EntityInstance(Instance):
         - `list[Entity | User | Organization]`
         """
 
-        _res = self.fetch('entities', **query)
+        _res = self.fetch('individuals', **query)
+        _res.extend(self.fetch('organizations', **query))
 
-        return [ self.get_entity(NSID(entity['key'])) for entity in _res if entity is not None ]
+        return [ self.get_entity(NSID(entity['id'])) for entity in _res if entity is not None ]
 
     def get_entity_groups(self, id: str | NSID) -> list[Organization]:
         """
@@ -221,8 +222,8 @@ class EntityInstance(Instance):
             return None
 
         position = Position(id)
-        position.name = _data['name']
-        position.permissions.edit(dict(zip(_data['permissions'], True)))
+        position.name = _data['title']
+        position.permissions.edit(**{ p: True for p in _data['permissions'] })
 
         return position
 

{nsarchive-2.0.0a2 → nsarchive-2.0.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "2.0.0-alpha.2"
+version = "2.0.0-alpha.4"
 description = "API-wrapper pour récupérer des données liées à Nation"
 authors = ["happex <110610727+okayhappex@users.noreply.github.com>"]
 license = "GPL-3.0"