Merge pull request #221 from george0st/change

Add outgoing transactions
george0st · Aug 23, 2024 · 2c3598d · 2c3598d
2 parents 545f212 + 4c39860
commit 2c3598d
Show file tree

Hide file tree

Showing 31 changed files with 575 additions and 563 deletions.
diff --git a/02-data/01-size-100/01-basic_party.csv.gz b/02-data/01-size-100/01-basic_party.csv.gz
diff --git a/02-data/01-size-100/01-basic_party.parquet b/02-data/01-size-100/01-basic_party.parquet
diff --git a/02-data/01-size-100/02-basic_contact.csv.gz b/02-data/01-size-100/02-basic_contact.csv.gz
diff --git a/02-data/01-size-100/02-basic_contact.parquet b/02-data/01-size-100/02-basic_contact.parquet
diff --git a/02-data/01-size-100/03-basic_relation.csv.gz b/02-data/01-size-100/03-basic_relation.csv.gz
diff --git a/02-data/01-size-100/03-basic_relation.parquet b/02-data/01-size-100/03-basic_relation.parquet
diff --git a/02-data/01-size-100/04-basic_account.csv.gz b/02-data/01-size-100/04-basic_account.csv.gz
diff --git a/02-data/01-size-100/04-basic_account.parquet b/02-data/01-size-100/04-basic_account.parquet
diff --git a/02-data/01-size-100/05-basic_transaction.csv.gz b/02-data/01-size-100/05-basic_transaction.csv.gz
diff --git a/02-data/01-size-100/05-basic_transaction.parquet b/02-data/01-size-100/05-basic_transaction.parquet
diff --git a/02-data/01-size-100/06-basic_event.csv.gz b/02-data/01-size-100/06-basic_event.csv.gz
diff --git a/02-data/01-size-100/06-basic_event.parquet b/02-data/01-size-100/06-basic_event.parquet
diff --git a/02-data/01-size-100/07-basic_communication.csv.gz b/02-data/01-size-100/07-basic_communication.csv.gz
diff --git a/02-data/01-size-100/07-basic_communication.parquet b/02-data/01-size-100/07-basic_communication.parquet
diff --git a/02-data/02-size-1K/01-basic_party.csv.gz b/02-data/02-size-1K/01-basic_party.csv.gz
diff --git a/02-data/02-size-1K/01-basic_party.parquet b/02-data/02-size-1K/01-basic_party.parquet
diff --git a/02-data/02-size-1K/02-basic_contact.csv.gz b/02-data/02-size-1K/02-basic_contact.csv.gz
diff --git a/02-data/02-size-1K/02-basic_contact.parquet b/02-data/02-size-1K/02-basic_contact.parquet
diff --git a/02-data/02-size-1K/03-basic_relation.csv.gz b/02-data/02-size-1K/03-basic_relation.csv.gz
diff --git a/02-data/02-size-1K/03-basic_relation.parquet b/02-data/02-size-1K/03-basic_relation.parquet
diff --git a/02-data/02-size-1K/04-basic_account.csv.gz b/02-data/02-size-1K/04-basic_account.csv.gz
diff --git a/02-data/02-size-1K/04-basic_account.parquet b/02-data/02-size-1K/04-basic_account.parquet
diff --git a/02-data/02-size-1K/05-basic_transaction.csv.gz b/02-data/02-size-1K/05-basic_transaction.csv.gz
diff --git a/02-data/02-size-1K/05-basic_transaction.parquet b/02-data/02-size-1K/05-basic_transaction.parquet
diff --git a/02-data/02-size-1K/06-basic_event.csv.gz b/02-data/02-size-1K/06-basic_event.csv.gz
diff --git a/02-data/02-size-1K/06-basic_event.parquet b/02-data/02-size-1K/06-basic_event.parquet
diff --git a/02-data/02-size-1K/07-basic_communication.csv.gz b/02-data/02-size-1K/07-basic_communication.csv.gz
diff --git a/02-data/02-size-1K/07-basic_communication.parquet b/02-data/02-size-1K/07-basic_communication.parquet
diff --git a/03-test/01-size-100.json b/03-test/01-size-100.json
diff --git a/03-test/02-size-1k.json b/03-test/02-size-1k.json
diff --git a/generator/basic_transaction.py b/generator/basic_transaction.py
@@ -64,7 +64,7 @@ def generate(self, count):
                                               - month)
                     if new_date > date_to:
                         continue
-                    self.model.append(self._create_transaction(account, new_date, True))
+                    self.model.append(self._create_transaction(account, new_date, True, 1500, 5000))
 
                 # INCOME - addition income (0..2 times)
                 for _ in range(int(self.rnd_choose([0,1,2],[0.9, 0.08, 0.02]))):
@@ -74,12 +74,19 @@ def generate(self, count):
                                                 - month)
                     if new_date > date_to:
                         continue
-                    self.model.append(self._create_transaction(account, new_date, True))
+                    self.model.append(self._create_transaction(account, new_date, True, 500, 2500))
 
-                # OUTCOME
-                # TODO: add code
+                # OUTCOME - typical outcome (0..5 times)
+                for _ in range(int(self.rnd_choose([0,1,2,3,4,5],[0.002, 0.6, 0.2, 0.13, 0.05, 0.018]))):
+                    new_date = self.change_date(date_to.year,
+                                                date_to.month,
+                                                int(self.rnd_int(1, 29)),
+                                                - month)
+                    if new_date > date_to:
+                        continue
+                    self.model.append(self._create_transaction(account, new_date, False, 300, 800))
 
-    def _create_transaction(self, account, new_date, income=True):
+    def _create_transaction(self, account, new_date, income, finance_min = 1500, finance_max = 5000):
         model = self.model_item()
 
         # "name": "transaction_id",
@@ -101,10 +108,7 @@ def _create_transaction(self, account, new_date, income=True):
 
         # "name": "transaction_value",
         # "description": "Transaction value",
-        if income:
-            model['transaction_value'] = self.rnd_choose(range(1500, 5000))
-        else:
-            model['transaction_value'] = self.rnd_choose(range(200, 1000))
+        model['transaction_value'] = self.rnd_choose(range(finance_min, finance_max))
 
         # "name": "transaction_currency",
         # "description": "Transaction currency",