nsarchive 2.0.0a6__py3-none-any.whl → 2.0.0a7__py3-none-any.whl

nsarchive/instances/_economy.py

@@ -244,7 +244,7 @@ class EconomyInstance(Instance):
         if type(archive) == Transaction:
             _data['_type'] = "transaction"
         else:
-            _data['_type'] = "unknown"
+            _data['_type'] = "action"
 
         self._put_in_db('archives', _data)
 

nsarchive/instances/_entities.py

@@ -167,8 +167,20 @@ class EntityInstance(Instance):
         - `list[Entity | User | Organization]`
         """
 
-        _res = self.fetch('individuals', **query)
-        _res.extend(self.fetch('organizations', **query))
+        if "_type" in query.keys():
+            if query["_type"] == "individual":
+                del query["_type"]
+                _res = self.fetch('individuals', **query)
+            elif query["_type"] == "organization":
+                del query["_type"]
+                _res = self.fetch('organizations', **query)
+            else:
+                del query["_type"]
+                _res = self.fetch('individuals', **query)
+                _res.extend(self.fetch('organizations', **query))
+        else:
+            _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 ]
 
@@ -247,7 +259,7 @@ class EntityInstance(Instance):
         elif type(archive) == Report:
             _data['_type'] = "report"
         else:
-            _data['_type'] = "unknown"
+            _data['_type'] = "action"
 
         self._put_in_db('archives', _data)
 

nsarchive/instances/_republic.py

@@ -14,8 +14,8 @@ class RepublicInstance(Instance):
     Gère les interactions avec les votes, les archives de la république, et les fonctionnaires.
 
     ## Informations
-    - Résultats des votes: `.Vote | .ClosedVote`
-    - Différentes institutions: `.Institutions | .Administration | .Government | .Assembly | .Court | .PoliceForces`
+    - Résultats des votes et procès: `.Vote | .Referendum | .Lawsuit`
+    - Différentes institutions: `.State | .Administration | .Government | .Assembly | .Court | .PoliceForces`
     - Occupants des différents rôles et historique de leurs actions: `.Official`
     """
 
@@ -35,7 +35,7 @@ class RepublicInstance(Instance):
             ID du vote.
 
         ## Renvoie
-        - `.Vote | .ClosedVote`
+        - `.Vote | .Referendum | .Lawsuit`
         """
 
         id = NSID(id)
@@ -60,7 +60,7 @@ class RepublicInstance(Instance):
 
         return vote
 
-    def save_vote(self, vote: Vote | Referendum) -> None:
+    def save_vote(self, vote: Vote | Referendum | Lawsuit) -> None:
         """Sauvegarde un vote dans la base de données."""
 
         vote.id = NSID(vote.id)
@@ -222,7 +222,7 @@ class RepublicInstance(Instance):
         elif type(archive) == Demotion:
             _data['_type'] = "demotion"
         else:
-            _data['_type'] = "unknown"
+            _data['_type'] = "action"
 
         self._put_in_db('archives', _data)
         self._put_in_db('mandate', _data) # Ajouter les archives à celle du mandat actuel

{nsarchive-2.0.0a6.dist-info → nsarchive-2.0.0a7.dist-info}/METADATA

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

{nsarchive-2.0.0a6.dist-info → nsarchive-2.0.0a7.dist-info}/RECORD

@@ -6,11 +6,11 @@ nsarchive/cls/economy.py,sha256=fnzmliHsUBEdu5RrrSkimpcgou_HFnivP_lmzLKCaDI,1360
 nsarchive/cls/entities.py,sha256=hjqCtsQHQZrLFwR57d_n4FssJ53-jdniQMHUAJGuDPY,6612
 nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
 nsarchive/cls/republic.py,sha256=4amjvCS5BnrvEgbjjDx_tOit3TbOSCMTsns6ifceL_8,2464
-nsarchive/instances/_economy.py,sha256=PjdqVJspZIuge5oqeJ_7fWrddfogH2yCEu0EgOhJv90,7445
-nsarchive/instances/_entities.py,sha256=VckXexRhsZRq4qLZuMWp74sB5gLeuR4sj8yXxijFI94,9814
-nsarchive/instances/_republic.py,sha256=sIaqz2lhmmjz3Y8l4iwY737JVCVt077OwP0-1dPsEaw,10071
+nsarchive/instances/_economy.py,sha256=7p1Ofu17hhuN2RWVWxwA28EDlMP8sAueT3bCOVlvRsY,7444
+nsarchive/instances/_entities.py,sha256=zu0ZaKXKCEFv6DNQiRkk13CufHyEYAi3Bx9LaYJ6tkc,10346
+nsarchive/instances/_republic.py,sha256=5-6XjPWNcR8sHxm1ipWlQXUIi-UKmfo2OHir9QSQvWM,10106
 nsarchive/utils/assets.py,sha256=WGC03K1VZ5LwGzcVXbqphtGBZ_Vjso-1hmbIkpgL_X8,382
-nsarchive-2.0.0a6.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-2.0.0a6.dist-info/METADATA,sha256=i4aiTtyC5fc5kr8PD7TOCtAfxJwfATw60Gim-t5xY9k,5697
-nsarchive-2.0.0a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-2.0.0a6.dist-info/RECORD,,
+nsarchive-2.0.0a7.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-2.0.0a7.dist-info/METADATA,sha256=wysDMQVOMEo3d23n2HkSAyd8DFUmHjd36DKow8REQF8,5697
+nsarchive-2.0.0a7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-2.0.0a7.dist-info/RECORD,,