nsarchive 2.0.0a3__tar.gz → 2.0.0a5__tar.gz

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/PKG-INFO

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

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/nsarchive/__init__.py

@@ -18,6 +18,7 @@ from .cls.base import NSID
 from .cls.archives import *
 from .cls.entities import *
 from .cls.republic import *
+from .cls.economy import *
 
 from .cls.exceptions import *
 

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/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.0a3 → nsarchive-2.0.0a5}/nsarchive/cls/economy.py

@@ -19,17 +19,20 @@ class Item:
 class Inventory:
     def __init__(self, owner_id: NSID) -> None:
         self.owner_id: NSID = NSID(owner_id)
-        self.objects: list[Item] = []
+        self.objects: dict[str, NSID] = {}
 
     def append(self, item: Item, quantity: int = 1):
-        self.objects.extend(quantity * [ item ])
+        if item.id in self.objects.keys():
+            self.objects[item.id] += quantity
+        else:
+            self.objects[item.id] = quantity
 
     def throw(self, item: Item, quantity: int = 1):
-        if quantity > self.objects.count(item):
-            quantity = self.objects.count(item)
-
-        for i in range(quantity):
-            self.objects.remove(item)
+        if item.id in self.objects.keys():
+            if self.objects[item.id] > quantity:
+                self.objects[item.id] -= quantity
+            else:
+                self.objects[item.id] = 0
 
 class Sale:
     def __init__(self, id: NSID, item: Item) -> None:

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/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:
@@ -43,7 +43,7 @@ class Entity:
         self.id: NSID = NSID(id) # ID hexadécimal de l'entité (ou nom dans le cas de l'entreprise)
         self.name: str = "Entité Inconnue"
         self.registerDate: int = 0
-        self.legalPosition: Position = Position()
+        self.position: Position = Position()
         self.additional: dict = {}
 
     def set_name(self, new_name: str) -> None:
@@ -53,7 +53,7 @@ class Entity:
         self.name = new_name
 
     def set_position(self, position: str) -> None:
-        self.legalPosition = position
+        self.position = position
 
     def add_link(self, key: str, value: str | int) -> None:
         if isinstance(value, str) or isinstance(value, int):

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/nsarchive/cls/republic.py

@@ -11,7 +11,7 @@ class Vote:
         self.startDate: int = 0
         self.endDate: int = 0
 
-class ClosedVote(Vote): # Meilleur nom pour cette classe en v2
+class Referendum(Vote):
     def __init__(self, id: str | NSID, title: str) -> None:
         super().__init__(id, title, ('yes', 'no', 'blank'))
 

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/nsarchive/instances/_economy.py

@@ -39,8 +39,9 @@ class EconomyInstance(Instance):
         account = BankAccount(id)
         account.amount = _data['amount']
         account.frozen = _data['frozen']
-        account.owner = _data['owner_id']
+        account.owner = NSID(_data['owner_id'])
         account.bank = _data['bank']
+        account.income = _data['income']
 
         return account
 
@@ -52,7 +53,8 @@ class EconomyInstance(Instance):
             'amount': account.amount,
             'frozen': account.frozen, 
             'owner_id': account.owner, 
-            'bank': account.bank
+            'bank': account.bank,
+            'income': account.income
         }
 
         self._put_in_db('accounts', _data)
@@ -66,19 +68,66 @@ class EconomyInstance(Instance):
         self.save_account(account)
 
     """
-    ---- VENTES ----
+    ---- OBJETS & VENTES ----
     """
 
-    def get_sale(self, id: str | NSID) -> Sale | None:
+    def save_item(self, item: Item) -> None:
+        """
+        Sauvegarde des infos à propos d'un item.
+
+        ## Paramètres
+        item: `.Item`\n
+            Article à sauvegarder
+        """
+
+        _item = item.__dict__
+        self._put_in_db('items', _item)
+
+    def get_item(self, id: NSID) -> Item | None:
+        """
+        Récupère des informations à propos d'un item.
+
+        ## Paramètres
+        id: `NSID`\n
+            ID de l'item
+
+        ## Retourne
+        - `.Item` si quelque chose est trouvé, sinon
+        - `None`
+        """
+
+        _item = self._get_by_ID('items', id)
+
+        if _item is None:
+            return
+
+        item = Item(id)
+        item.title = _item['title']
+        item.emoji = _item['emoji']
+
+        return item
+
+    def delete_item(self, item: Item) -> None:
+        """
+        Annule le référencement d'un item.
+
+        ## Paramètres
+        item: `.Item`\n
+            Item à vendre
+        """
+
+        self._delete_by_ID('items', item.id)
+
+    def get_sale(self, id: NSID) -> Sale | None:
         """
         Récupère une vente disponible sur le marketplace.
 
         ## Paramètres
-        id: `str | NSID`\n
-            ID de l'item.
+        id: `NSID`\n
+            ID de la vente.
 
         ## Renvoie
-        - `.Item | None`
+        - `.Sale | None`
         """
 
         id = NSID(id)
@@ -87,8 +136,10 @@ class EconomyInstance(Instance):
 
         if _data is None:
             return None
+        
+        item = self.get_item(_data['id'])
 
-        sale = Sale(NSID(id))
+        sale = Sale(NSID(id), Item(_data['id']) if item is None else item)
         sale.__dict__ = _data
 
         return sale
@@ -147,8 +198,7 @@ class EconomyInstance(Instance):
         inventory = Inventory(id)
 
         for _item in _data['objects']:
-            item = Item(_item['id'])
-            item.__dict__ = _item
+            item = self.get_item(_item)
 
             inventory.objects.append(item)
 
@@ -163,10 +213,7 @@ class EconomyInstance(Instance):
             Inventaire à sauvegarder
         """
 
-        _data = {
-            "owner_id": inventory.owner_id,
-            "objects": [ object.__dict__ for object in inventory.objects ]
-        }
+        _data = inventory.__dict__
 
         self._put_in_db('inventories', _data)
 

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/nsarchive/instances/_entities.py

@@ -72,7 +72,7 @@ class EntityInstance(Instance):
                 _member_profile = self.get_entity(member.id)
 
                 member.set_name(_member_profile.name)
-                member.legalPosition = _member_profile.legalPosition
+                member.position = _member_profile.position
                 member.registerDate = _member_profile.registerDate
 
                 member.xp = _member_profile.xp
@@ -89,7 +89,7 @@ class EntityInstance(Instance):
             entity = Entity(id)
 
         entity.name = _data['name']
-        entity.legalPosition = _data['position'] # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
+        entity.position = _data['position'] # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
         entity.registerDate = _data['register_date']
 
         for  key, value in _data.get('additional', {}).items():
@@ -114,7 +114,7 @@ class EntityInstance(Instance):
         _data = {
             'id': entity.id,
             'name': entity.name,
-            'position': entity.legalPosition,
+            'position': entity.position,
             'register_date': entity.registerDate,
             'additional': {},
         }
@@ -167,7 +167,8 @@ 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['id'])) for entity in _res if entity is not None ]
 
@@ -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.0a3 → nsarchive-2.0.0a5}/nsarchive/instances/_republic.py

@@ -26,7 +26,7 @@ class RepublicInstance(Instance):
     ---- VOTES & REFERENDUMS ----
     """
 
-    def get_vote(self, id: str | NSID) -> Vote | ClosedVote | Lawsuit:
+    def get_vote(self, id: str | NSID) -> Vote | Referendum | Lawsuit:
         """
         Récupère un vote spécifique.
 
@@ -44,10 +44,10 @@ class RepublicInstance(Instance):
         if _data is None:
             return None
 
-        if _data['_type'] == 'open':
+        if _data['_type'] == 'vote':
             vote = Vote(id, _data['title'], tuple(_data['choices'].keys()))
-        elif _data['_type'] == 'closed':
-            vote = ClosedVote(id, _data['title'])
+        elif _data['_type'] == 'referendum':
+            vote = Referendum(id, _data['title'])
         elif _data['_type'] == 'lawsuit':
             vote = Lawsuit(id, _data['title'])
         else:
@@ -60,14 +60,14 @@ class RepublicInstance(Instance):
 
         return vote
 
-    def save_vote(self, vote: Vote | ClosedVote) -> None:
+    def save_vote(self, vote: Vote | Referendum) -> None:
         """Sauvegarde un vote dans la base de données."""
 
         vote.id = NSID(vote.id)
 
         _data = {
-            '_type':'open' if type(vote) == Vote else\
-                    'closed' if type(vote) == ClosedVote else\
+            '_type':'vote' if type(vote) == Vote else\
+                    'referendum' if type(vote) == Referendum else\
                     'lawsuit' if type(vote) == Lawsuit else\
                     'unknown',
             'title': vote.title,

{nsarchive-2.0.0a3 → nsarchive-2.0.0a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "2.0.0-alpha.3"
+version = "2.0.0-alpha.5"
 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"