refactor: consolidate contact attributes into Person and Student classes, removing Contact class

lab2/README.md

@@ -20,27 +20,19 @@ classDiagram
         + Node(student : Student)
     }
 
-    class Contact {
+    class Person {
+        - id : String
+        - git : String
         - phone : String?
         - telegram : String?
         - email : String?
-        + Contact(phone : String?, telegram : String?, email : String?)
-        + present() : Boolean
-        + get_single_contact() : String
+        + Person(id : String, git : String, phone: String, telegram: String, email: String)
         + phone=(String) : Boolean
         + telegram=(String) : Boolean
         + email=(String) : Boolean
         + self.valid_phone_number() : Boolean
         + self.valid_telegram() : Boolean
         + self.valid_email() : Boolean
-        + new_from_info(info_string : String) : Contact
-    }
-
-    class Person {
-        - id : String
-        - git : String
-        - contact : Contact
-        + Person(id : String, git : String, contact : Contact = new Contact())
         + git_present() : Boolean
         + contact_present() : Boolean
         + contact_info() : String
@@ -59,7 +51,7 @@ classDiagram
 
     class StudentShort {
         - surname_initials : String
-        + StudentShort(id : String, git : String, surname_initials : String, contact : Contact)
+        + StudentShort(id : String, surname_initials : String, phone: String, telegram: String, email: String)
         + self.from_student(student : Student) : StudentShort
         + self.from_string(id : String, info_string : String) : StudentShort
         + to_s() : String
@@ -71,7 +63,7 @@ classDiagram
         - patronymic : String
         - birth_date : Date
         - const NAME_REGEX : String
-        + Student(id : String, git : String, contact : Contact, surname : String, name : String, patronymic : String, birth_date : Date)
+        + Student(id : String, git : String, phone: String, telegram: String, email: String, surname : String, name : String, patronymic : String, birth_date : Date)
         + self.from_string(student_string : String) : Student
         + surname_and_initials() : String
         + to_s() : String
@@ -87,7 +79,6 @@ classDiagram
 
     BinarySearchTree o-- Node
     Node o-- Student
-    Contact <|-- Person
     Person <|-- Student
     Person <|-- StudentShort
     Student <.. StudentRepository