refactor: rename name_initials to surname_initials for consistency

lab2
Artem-Darius Weber 3 days ago
parent bb2280d48e
commit bffdd2f072

@ -49,9 +49,9 @@ classDiagram
} }
class StudentShort { class StudentShort {
- name_initials : String - surname_initials : String
+ get_name_initials() : String + get_surname_initials() : String
+ StudentShort(id : String, name_initials : String, phone: String, telegram: String, email: String) + StudentShort(id : String, surname_initials : String, phone: String, telegram: String, email: String)
+ from_student(student : Student) : StudentShort <<class>> + from_student(student : Student) : StudentShort <<class>>
+ from_string(id : String, info_string : String) : StudentShort <<class>> + from_string(id : String, info_string : String) : StudentShort <<class>>
+ to_s() : String + to_s() : String
@ -66,7 +66,7 @@ classDiagram
- const NAME_REGEX : String - const NAME_REGEX : String
+ Student(id : String, git : String, phone: String, telegram: String, email: String, 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)
+ from_string(student_string : String) : Student <<class>> + from_string(student_string : String) : Student <<class>>
+ surname_and_initials() : String + surname_initials() : String
+ to_s() : String + to_s() : String
+ get_info() : String + get_info() : String
+ surname=(surname : String) + surname=(surname : String)

@ -45,7 +45,7 @@ class Student < Person
) )
end end
def surname_and_initials def surname_initials
"#{@surname} #{name_initial(@name)}.#{patronymic_initial(@patronymic)}." "#{@surname} #{name_initial(@name)}.#{patronymic_initial(@patronymic)}."
end end
@ -56,7 +56,7 @@ class Student < Person
end end
def get_info def get_info
"#{surname_and_initials}, Git: #{@git}, Contact: #{get_first_contact}, Birth Date: #{@birth_date}" "#{surname_initials}, Git: #{@git}, Contact: #{get_first_contact}, Birth Date: #{@birth_date}"
end end
def surname=(surname) def surname=(surname)

@ -1,18 +1,18 @@
require_relative 'person' require_relative 'person'
class StudentShort < Person class StudentShort < Person
attr_reader :name_initials attr_reader :surname_initials
def initialize(id:, name_initials:, phone: nil, telegram: nil, email: nil) def initialize(id:, surname_initials:, phone: nil, telegram: nil, email: nil)
super(id: id, phone: phone, telegram: telegram, email: email) super(id: id, phone: phone, telegram: telegram, email: email)
@name_initials = name_initials @surname_initials = surname_initials
freeze freeze
end end
def self.from_student(student) def self.from_student(student)
new( new(
id: student.id, id: student.id,
name_initials: student.surname_and_initials, surname_initials: student.surname_and_initials,
phone: student.phone, phone: student.phone,
telegram: student.telegram, telegram: student.telegram,
email: student.email email: student.email
@ -23,14 +23,14 @@ class StudentShort < Person
parts = info_string.split(',').map(&:strip) parts = info_string.split(',').map(&:strip)
raise ArgumentError, 'Invalid info string format' if parts.size < 2 raise ArgumentError, 'Invalid info string format' if parts.size < 2
name_initials = parts[0] surname_initials = parts[0]
contact_string = parts[1].split(': ', 2).last.strip contact_string = parts[1].split(': ', 2).last.strip
phone, telegram, email = parse_contact_string(contact_string) phone, telegram, email = parse_contact_string(contact_string)
new( new(
id: id, id: id,
name_initials: name_initials, surname_initials: surname_initials,
phone: phone, phone: phone,
telegram: telegram, telegram: telegram,
email: email email: email
@ -39,7 +39,7 @@ class StudentShort < Person
def to_s def to_s
contact_info = get_first_contact() contact_info = get_first_contact()
"#{@name_initials}, Contact: #{contact_info}" "#{@surname_initials}, Contact: #{contact_info}"
end end
private private

Loading…
Cancel
Save