[chore] adjust variable names to match field name

Author: kneckinator

g2p_connect_demo/models/generate_group.py

@@ -65,15 +65,13 @@ def _generate_sample_data(self, **kwargs):
         res_partner_model_obj = self.env["res.partner"]
         g2p_group_membership_model_obj = self.env["g2p.group.membership"]
 
-        # sex_choice_range = ["Female", "Male"] * 50 + ["Other"]
-        sex_choices = self.env["gender.type"].search([]).mapped("value")
-        sex_choice_range = sex_choices * 50
+        gender_choices = self.env["gender.type"].search([]).mapped("value")
+        gender_choice_range = gender_choices * 50
         age_group_range = ["A", "C", "N"] * 2 + ["E"]
         group_size_range = list(range(1, 2)) * 2 + list(range(3, 5)) * 4 + list(range(6, 8))
 
         group_membership_kind_head_id = self.env.ref("g2p_registry_membership.group_membership_kind_head").id
         group_kind_household_id = self.env.ref("g2p_registry_group.group_kind_household").id
-        # group_kind_family_id = self.env.ref("g2p_registry_group.group_kind_family").id
 
         num_groups = min(res.num_groups, 1000)
 
@@ -101,7 +99,7 @@ def _generate_sample_data(self, **kwargs):
             head = res._generate_individual_data(
                 fake,
                 last_name,
-                sex_choice_range,
+                gender_choice_range,
                 ["A", "E"],
                 registration_date,
                 bank_id,
@@ -150,7 +148,7 @@ def _generate_sample_data(self, **kwargs):
                 data = res._generate_individual_data(
                     fake,
                     last_name,
-                    sex_choice_range,
+                    gender_choice_range,
                     age_group_range,
                     registration_date,
                     bank_id,
@@ -213,8 +211,6 @@ def _generate_sample_data(self, **kwargs):
         )
         _logger.info(msg)
         return {"result": msg, "res_model": self._name, "res_ids": [res_id]}
-        # _logger.info("-" * 80)
-        # _logger.info(json.dumps({"group": group, "members": members}, indent=4))
 
     def mark_as_done(self):
         self.update({"state": "generate"})
@@ -223,14 +219,14 @@ def _generate_individual_data(
         self,
         fake,
         last_name,
-        sex_choice_range,
+        gender_choice_range,
         age_group_range,
         registration_date,
         bank_id,
     ):
-        sex = random.choice(sex_choice_range)
+        gender = random.choice(gender_choice_range)
         age_group = random.choice(age_group_range)
-        first_name = fake.first_name_male() if sex == "Male" else fake.first_name_female()
+        first_name = fake.first_name_male() if gender == "Male" else fake.first_name_female()
         different_last_name = random.randint(0, 100) < 10
         if age_group == "N":
             date_start = datetime.datetime.now() - relativedelta(years=1)
@@ -272,22 +268,24 @@ def _generate_individual_data(
         registration_date = fake.date_between_dates(date_start=dob, date_end=datetime.datetime.now()).isoformat()
         dob = dob.isoformat()
 
-        fullname = f"{first_name} {last_name}"
+        full_name = f"{first_name} {last_name}"
         bank_ids = []
         phone = ""
-        # Do not give bank account to kids
+
+        # Do not assign bank accounts to children
         if age_group != "C":
             val = {
                 "bank_id": bank_id.id,
                 "acc_number": str(random.randint(1, 999999999)),
             }
             bank_ids.append([0, 0, val])
             phone = fake.phone_number()
+
         data = {
-            "name": fullname,
+            "name": full_name,
             "given_name": first_name,
             "family_name": last_name,
-            "gender": sex,
+            "gender": gender,
             "birthdate": dob,
             "is_registrant": True,
             "is_group": False,

spp_farmer_registry_demo/models/generate_farmer_data.py

@@ -110,13 +110,13 @@ def _generate_sample_data(self, **kwargs):
         fake = create_faker(res.locale)
 
         # Get available gender field selections
-        sex_choices = self.env["gender.type"].search([]).mapped("id")
-        sex_choice_range = sex_choices * 50
+        gender_choices = self.env["gender.type"].search([]).mapped("id")
+        gender_choice_range = gender_choices * 50
 
         num_groups = min(num_groups, self.GROUPS_PER_BATCH)
 
         for i in range(0, num_groups):
-            group_id = res._generate_group_data(i, fake, sex_choice_range, kind_farm_id)
+            group_id = res._generate_group_data(i, fake, gender_choice_range, kind_farm_id)
 
             land_record_id = res._generate_land_record_record(group_id, res.locale)
             group_id.farm_land_rec_id = land_record_id.id
@@ -178,8 +178,8 @@ def _generate_sample_data(self, **kwargs):
 
         return {"result": msg, "res_model": self._name, "res_ids": [res.id]}
 
-    def _generate_group_data(self, index, fake, sex_choice_range, kind_id):
-        sex = random.choice(sex_choice_range)
+    def _generate_group_data(self, index, fake, gender_choice_range, kind_id):
+        sex = random.choice(gender_choice_range)
         last_name = fake.last_name()
         first_name = fake.first_name_male() if sex == "Male" else fake.first_name_female()
         addl_name = fake.first_name_male() if sex == "Male" else fake.first_name_female()

spp_mis_demo/models/generate_group.py

@@ -69,8 +69,8 @@ def _generate_sample_data(self, **kwargs):
         fake = Faker(locales)
 
         # Get available gender field selections
-        sex_choices = self.env["gender.type"].search([]).mapped("id")
-        sex_choice_range = sex_choices * 50
+        gender_choices = self.env["gender.type"].search([]).mapped("id")
+        gender_choice_range = gender_choices * 50
 
         age_group_range = ["A", "C"] * 2 + ["E"]
         group_size_range = list(range(1, 2)) * 2 + list(range(3, 5)) * 4 + list(range(6, 8))
@@ -97,7 +97,7 @@ def _generate_sample_data(self, **kwargs):
             head = res._generate_individual_data(
                 fake[locale],
                 last_name,
-                sex_choice_range,
+                gender_choice_range,
                 age_group_range,
                 registration_date,
             )
@@ -126,7 +126,7 @@ def _generate_sample_data(self, **kwargs):
                 data = res._generate_individual_data(
                     fake[locale],
                     last_name,
-                    sex_choice_range,
+                    gender_choice_range,
                     age_group_range,
                     registration_date,
                 )
@@ -191,13 +191,11 @@ def _generate_sample_data(self, **kwargs):
         )
         _logger.info(msg)
         return {"result": msg, "res_model": self._name, "res_ids": [res_id]}
-        # _logger.info("-" * 80)
-        # _logger.info(json.dumps({"group": group, "members": members}, indent=4))
 
-    def _generate_individual_data(self, fake, last_name, sex_choice_range, age_group_range, registration_date):
-        sex = random.choice(sex_choice_range)
+    def _generate_individual_data(self, fake, last_name, gender_choice_range, age_group_range, registration_date):
+        gender = random.choice(gender_choice_range)
         age_group = random.choice(age_group_range)
-        first_name = fake.first_name_male() if sex == "Male" else fake.first_name_female()
+        first_name = fake.first_name_male() if gender == "Male" else fake.first_name_female()
         different_last_name = random.randint(0, 100) < 10
         registration_date_days = datetime.datetime.now() - datetime.datetime.strptime(registration_date, "%Y-%m-%d")
         registration_date_days = registration_date_days.days + 1
@@ -223,7 +221,7 @@ def _generate_individual_data(self, fake, last_name, sex_choice_range, age_group
 
         pregnancy_start = None
         lactation_start = None
-        if sex == "Female" and age_group == "A":
+        if gender == "Female" and age_group == "A":
             rnd = random.randint(0, 100)
             if rnd < 15:
                 pregnancy_start = fake.date_between_dates(
@@ -237,13 +235,13 @@ def _generate_individual_data(self, fake, last_name, sex_choice_range, age_group
                 ).isoformat()
 
         dob = fake.date_between_dates(date_start=date_start, date_end=date_end).isoformat()
-        fullname = f"{first_name} {last_name}"
+        full_name = f"{first_name} {last_name}"
 
         return {
-            "name": fullname,
+            "name": full_name,
             "given_name": first_name,
             "family_name": last_name,
-            "gender": sex,
+            "gender": gender,
             "birthdate": dob,
             "is_registrant": True,
             "is_group": False,