nsarchive 2.0.0a2__py3-none-any.whl → 2.0.0a4__py3-none-any.whl

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/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/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.dist-info → nsarchive-2.0.0a4.dist-info}/METADATA

@@ -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.dist-info → nsarchive-2.0.0a4.dist-info}/RECORD

@@ -1,16 +1,16 @@
 nsarchive/__init__.py,sha256=-yXGGJBOkoQo-6Vg6hJVIqr-C7sQyL_LaYcQ3yx9aFs,696
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=HHQhGKdnl7vD5zC8-bbXeQLhp8A98bBlneJTkztOmMg,2007
-nsarchive/cls/base.py,sha256=jJOsGgnURxR8YwJiIHgodPOmJ31LOtYDVbz33kIM5Yg,3512
+nsarchive/cls/base.py,sha256=7DRehwuUETaelrVDCQiOx3lZC00XhX5iVIIjTqnlM4s,3564
 nsarchive/cls/economy.py,sha256=-eV8R5KMXSeXcKEu2G8OP1UgYgb0X6uks0aD2XhlbcU,1220
-nsarchive/cls/entities.py,sha256=i7tlx-fDpwGWsnGgpXrLcASLHYQjf1dXUCdr1mKc4Ik,6629
+nsarchive/cls/entities.py,sha256=-88-mfd58PjuTHuOLH9COoa447Dp0e7d70Naa9TS_Ow,6622
 nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
 nsarchive/cls/republic.py,sha256=F6il2FrvCoutHxQlW3xM36GaFfIqdorg2jicMAlPdUo,2503
 nsarchive/instances/_economy.py,sha256=kaFRm6SpWCgvkv-PTVicGztL3e34gSy6WZQDiLZLaT4,6346
-nsarchive/instances/_entities.py,sha256=QX2bfTXTGIJ_GaesIEXzjpDneUFRV4os_ka8kOoh3-Y,9763
+nsarchive/instances/_entities.py,sha256=HX1yDqIC5gr0XOx9PpwHbZ42f3WI9P4z9NWhBxNUQFk,9834
 nsarchive/instances/_republic.py,sha256=TBfgILDJujbp5tiEgbHGnP_uuW1tdAzGUtkwJmuMogE,10063
 nsarchive/utils/assets.py,sha256=WGC03K1VZ5LwGzcVXbqphtGBZ_Vjso-1hmbIkpgL_X8,382
-nsarchive-2.0.0a2.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-2.0.0a2.dist-info/METADATA,sha256=Rt2Rho6v3VRoRgMbPRkZ_02FH9wkPzSXpz7lJDANE-Q,5697
-nsarchive-2.0.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-2.0.0a2.dist-info/RECORD,,
+nsarchive-2.0.0a4.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-2.0.0a4.dist-info/METADATA,sha256=C3k5PaWIG3o1gMHFosXOUwGWHytHufq291hxEKqdVQo,5697
+nsarchive-2.0.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-2.0.0a4.dist-info/RECORD,,