Removingget and set methods from PISubject class

Author: adrianoaru-nhs

classes/data/data_creation.py

@@ -111,40 +111,41 @@ def generate_random_subject(
             f"generateRandomSubject: {random_words_list}, {pi_reference}, {region}"
         )
         pi_subject = PISubject()
-        pi_subject.set_nhs_number(NHSNumberTools.generate_random_nhs_number())
+        pi_subject.nhs_number = NHSNumberTools.generate_random_nhs_number()
         person = self.generate_random_person(random_words_list, GenderType.NOT_KNOWN)
-        pi_subject.set_family_name(person.get_surname())
-        pi_subject.set_first_given_names(person.get_forename())
-        pi_subject.set_other_given_names(person.get_other_forenames())
-        pi_subject.set_previous_family_name(person.get_previous_surname())
-        pi_subject.set_name_prefix(person.get_title())
-        pi_subject.set_birth_date(
-            datetime.date.today() - datetime.timedelta(days=60 * 365)
+        pi_subject.family_name = person.get_surname()
+        pi_subject.first_given_names = person.get_forename()
+        pi_subject.other_given_names = person.get_other_forenames()
+        pi_subject.previous_family_name = person.get_previous_surname()
+        pi_subject.name_prefix = person.get_title()
+        pi_subject.birth_date = datetime.date.today() - datetime.timedelta(
+            days=60 * 365
         )
-        pi_subject.set_death_date(None)
+
+        pi_subject.death_date = None
         gender = person.get_gender()
         if gender is not None:
-            pi_subject.set_gender_code(gender.redefined_value)
+            pi_subject.gender_code = gender.redefined_value
         else:
-            pi_subject.set_gender_code(GenderType.NOT_KNOWN.redefined_value)
+            pi_subject.gender_code = GenderType.NOT_KNOWN.redefined_value
         address = self.generate_random_address(random_words_list)
-        pi_subject.set_address_line1(address.get_address_line1())
-        pi_subject.set_address_line2(address.get_address_line2())
-        pi_subject.set_address_line3(address.get_address_line3())
-        pi_subject.set_address_line4(address.get_address_line4())
-        pi_subject.set_address_line5(address.get_address_line5())
-        pi_subject.set_post_code(address.get_post_code())
-        pi_subject.set_registration_code(self.generate_random_registration_code())
+        pi_subject.address_line_1 = address.get_address_line1()
+        pi_subject.address_line_2 = address.get_address_line2()
+        pi_subject.address_line_3 = address.get_address_line3()
+        pi_subject.address_line_4 = address.get_address_line4()
+        pi_subject.address_line_5 = address.get_address_line5()
+        pi_subject.postcode = address.get_post_code()
+        pi_subject.gnc_code = self.generate_random_registration_code()
         gp_surgery = self.generate_random_gp_surgery(region)
         if gp_surgery is not None:
-            pi_subject.set_gp_practice_code(gp_surgery.get_code())
-        pi_subject.set_nhais_deduction_reason(None)
-        pi_subject.set_nhais_deduction_date(None)
-        pi_subject.set_exeter_system("ATO")
-        pi_subject.set_removed_to(None)
-        pi_subject.set_pi_reference(pi_reference)
-        pi_subject.set_superseded_by_nhs_number(None)
-        pi_subject.set_replaced_by_nhs_number(None)
+            pi_subject.gp_practice_code = gp_surgery.get_code()
+        pi_subject.nhais_deduction_reason = None
+        pi_subject.nhais_deduction_date = None
+        pi_subject.exeter_system = "ATO"
+        pi_subject.removed_to = None
+        pi_subject.pi_reference = pi_reference
+        pi_subject.superseded_by_nhs_number = None
+        pi_subject.replaced_nhs_number = None
         logging.info("generateRandomSubject: end")
         return pi_subject
 

classes/pi_subject.py

@@ -35,208 +35,6 @@ class PISubject:
     superseded_by_nhs_number: Optional[str] = None
     replaced_nhs_number: Optional[str] = None
 
-    def get_screening_subject_id(self) -> Optional[int]:
-        """Returns the screening subject ID."""
-        return self.screening_subject_id
-
-    def set_screening_subject_id(self, screening_subject_id: int) -> None:
-        """Sets the screening subject ID."""
-        self.screening_subject_id = screening_subject_id
-
-    def get_nhs_number(self) -> Optional[str]:
-        """Returns the NHS number."""
-        return self.nhs_number
-
-    def set_nhs_number(self, nhs_number: str) -> None:
-        """Sets the NHS number."""
-        self.nhs_number = nhs_number
-
-    def get_family_name(self) -> Optional[str]:
-        """Returns the family name."""
-        return self.family_name
-
-    def set_family_name(self, family_name: str) -> None:
-        """Sets the family name."""
-        self.family_name = family_name
-
-    def get_first_given_names(self) -> Optional[str]:
-        """Returns the first given names."""
-        return self.first_given_names
-
-    def set_first_given_names(self, first_given_names: str) -> None:
-        """Sets the first given names."""
-        self.first_given_names = first_given_names
-
-    def get_other_given_names(self) -> Optional[str]:
-        """Returns the other given names."""
-        return self.other_given_names
-
-    def set_other_given_names(self, other_given_names: str) -> None:
-        """Sets the other given names."""
-        self.other_given_names = other_given_names
-
-    def get_previous_family_name(self) -> Optional[str]:
-        """Returns the previous family name."""
-        return self.previous_family_name
-
-    def set_previous_family_name(self, previous_family_name: str) -> None:
-        """Sets the previous family name."""
-        self.previous_family_name = previous_family_name
-
-    def get_name_prefix(self) -> Optional[str]:
-        """Returns the name prefix."""
-        return self.name_prefix
-
-    def set_name_prefix(self, name_prefix: str) -> None:
-        """Sets the name prefix."""
-        self.name_prefix = name_prefix
-
-    def get_birth_date(self) -> Optional[date]:
-        """Returns the birth date."""
-        return self.birth_date
-
-    def set_birth_date(self, birth_date: date) -> None:
-        """Sets the birth date."""
-        self.birth_date = birth_date
-
-    def get_death_date(self) -> Optional[date]:
-        """Returns the death date."""
-        return self.death_date
-
-    def set_death_date(self, death_date: Optional[date]) -> None:
-        """Sets the death date."""
-        self.death_date = death_date
-
-    def get_gender_code(self) -> Optional[int]:
-        """Returns the gender code."""
-        return self.gender_code
-
-    def set_gender_code(self, gender_code: int) -> None:
-        """Sets the gender code."""
-        self.gender_code = gender_code
-
-    def get_address_line1(self) -> Optional[str]:
-        """Returns address line 1."""
-        return self.address_line_1
-
-    def set_address_line1(self, address_line1: str) -> None:
-        """Sets address line 1."""
-        self.address_line_1 = address_line1
-
-    def get_address_line2(self) -> Optional[str]:
-        """Returns address line 2."""
-        return self.address_line_2
-
-    def set_address_line2(self, address_line2: str) -> None:
-        """Sets address line 2."""
-        self.address_line_2 = address_line2
-
-    def get_address_line3(self) -> Optional[str]:
-        """Returns address line 3."""
-        return self.address_line_3
-
-    def set_address_line3(self, address_line3: str) -> None:
-        """Sets address line 3."""
-        self.address_line_3 = address_line3
-
-    def get_address_line4(self) -> Optional[str]:
-        """Returns address line 4."""
-        return self.address_line_4
-
-    def set_address_line4(self, address_line4: str) -> None:
-        """Sets address line 4."""
-        self.address_line_4 = address_line4
-
-    def get_address_line5(self) -> Optional[str]:
-        """Returns address line 5."""
-        return self.address_line_5
-
-    def set_address_line5(self, address_line5: str) -> None:
-        """Sets address line 5."""
-        self.address_line_5 = address_line5
-
-    def get_post_code(self) -> Optional[str]:
-        """Returns the post code."""
-        return self.postcode
-
-    def set_post_code(self, post_code: str) -> None:
-        """Sets the post code."""
-        self.postcode = post_code
-
-    def get_exeter_system(self) -> Optional[str]:
-        """Returns the Exeter system."""
-        return self.exeter_system
-
-    def set_exeter_system(self, exeter_system: str) -> None:
-        """Sets the Exeter system."""
-        self.exeter_system = exeter_system
-
-    def get_removed_to(self) -> Optional[str]:
-        """Returns the removed to field."""
-        return self.removed_to
-
-    def set_removed_to(self, removed_to: Optional[str]) -> None:
-        """Sets the removed to field."""
-        self.removed_to = removed_to
-
-    def get_superseded_by_nhs_number(self) -> Optional[str]:
-        """Returns the superseded by NHS number."""
-        return self.superseded_by_nhs_number
-
-    def set_superseded_by_nhs_number(
-        self, superseded_by_nhs_number: Optional[str]
-    ) -> None:
-        """Sets the superseded by NHS number."""
-        self.superseded_by_nhs_number = superseded_by_nhs_number
-
-    def get_replaced_by_nhs_number(self) -> Optional[str]:
-        """Returns the replaced by NHS number."""
-        return self.replaced_nhs_number
-
-    def set_replaced_by_nhs_number(self, replaced_by_nhs_number: Optional[str]) -> None:
-        """Sets the replaced by NHS number."""
-        self.replaced_nhs_number = replaced_by_nhs_number
-
-    def get_registration_code(self) -> Optional[str]:
-        """Returns the registration code."""
-        return self.gnc_code
-
-    def set_registration_code(self, registration_code: str) -> None:
-        """Sets the registration code."""
-        self.gnc_code = registration_code
-
-    def get_gp_practice_code(self) -> Optional[str]:
-        """Returns the GP practice code."""
-        return self.gp_practice_code
-
-    def set_gp_practice_code(self, gp_practice_code: str) -> None:
-        """Sets the GP practice code."""
-        self.gp_practice_code = gp_practice_code
-
-    def get_nhais_deduction_reason(self) -> Optional[str]:
-        """Returns the NHAIS deduction reason."""
-        return self.nhais_deduction_reason
-
-    def set_nhais_deduction_reason(self, nhais_deduction_reason: Optional[str]) -> None:
-        """Sets the NHAIS deduction reason."""
-        self.nhais_deduction_reason = nhais_deduction_reason
-
-    def get_nhais_deduction_date(self) -> Optional[date]:
-        """Returns the NHAIS deduction date."""
-        return self.nhais_deduction_date
-
-    def set_nhais_deduction_date(self, nhais_deduction_date: Optional[date]) -> None:
-        """Sets the NHAIS deduction date."""
-        self.nhais_deduction_date = nhais_deduction_date
-
-    def get_pi_reference(self) -> Optional[str]:
-        """Returns the PI reference."""
-        return self.pi_reference
-
-    def set_pi_reference(self, pi_reference: str) -> None:
-        """Sets the PI reference."""
-        self.pi_reference = pi_reference
-
     def to_string(self) -> str:
         """
         Returns a string representation of the PISubject object, showing all field names and values.

classes/repositories/subject_repository.py

@@ -40,14 +40,14 @@ def create_pi_subject(self, pio_id: int, pi_subject: PISubject) -> Optional[int]
             int: The new contact id.
         """
         logging.info(f"Creating PI subject: {pi_subject}")
-        nhs_number = pi_subject.get_nhs_number()
+        nhs_number = pi_subject.nhs_number
         if nhs_number is None:
             raise ValueError("NHS Number must be specified when creating a new subject")
         if self.find_by_nhs_number(nhs_number) is not None:
             raise ValueError(
                 f"Cannot create new subject with NHS Number {nhs_number} because it is already in use"
             )
-        if pi_subject.get_pi_reference is None:
+        if pi_subject.pi_reference is None:
             raise ValueError(
                 "A PI Reference must be specified when creating a new subject, for example 'SELF REFERRAL' or 'AUTOMATED TEST'"
             )
@@ -106,7 +106,7 @@ def update_pi_subject(self, pi_subject: PISubject) -> None:
             pi_subject (PISubject): The subject to update.
         """
         logging.info(f"Updating PI subject: {pi_subject}")
-        nhs_number = pi_subject.get_nhs_number()
+        nhs_number = pi_subject.nhs_number
         if nhs_number is None:
             raise ValueError("NHS Number must be specified when creating a new subject")
         if self.find_by_nhs_number(nhs_number) is None:

utils/oracle/subject_creation_util.py

@@ -283,9 +283,9 @@ def get_subject_details(self, subject: PISubject) -> str:
             str: Formatted details.
         """
         return "{} {} {} (DoB = {}, NHS number = {})".format(
-            self.safe_string(subject.get_name_prefix()),
-            self.safe_string(subject.get_first_given_names()),
-            self.safe_string(subject.get_family_name()),
-            self.safe_date(subject.get_birth_date()),
-            self.safe_string(subject.get_nhs_number()),
+            self.safe_string(subject.name_prefix),
+            self.safe_string(subject.first_given_names),
+            self.safe_string(subject.family_name),
+            self.safe_date(subject.birth_date),
+            self.safe_string(subject.nhs_number),
         )