refactor(chapter12): streamline Employee class by removing type validation and enhancing type handling

Author: s3ich4n

chapter12/src/case06/case06_2.py

@@ -1,50 +1,38 @@
 class Employee:
     def __init__(self, name, type):
-        self.validate_type(type)
         self._name = name
-        self._type = type
-
-    def validate_type(self, arg):
-        if arg not in ["engineer", "manager", "salesman"]:
-            raise ValueError(f"Employee cannot be of type {arg}")
-
-    @property
-    def type_string(self):
-        return str(self._type)
-
+        self._type = self.create_employee_type(type)
+    
     @property
     def type(self):
         return self._type
-
+    
     @type.setter
     def type(self, arg):
-        self._type = Employee.create_employee_type(arg)
-
+        self._type = self.create_employee_type(arg)
+    
     @property
     def capitalized_type(self):
-        return self.type_string.capitalize()
-
-    @classmethod
-    def create_employee_type(cls, employee_type):
-        if employee_type == "engineer":
+        return str(self._type).capitalize()
+    
+    @staticmethod
+    def create_employee_type(type_code):
+        if type_code == "engineer":
             return Engineer()
-        elif employee_type == "manager":
+        elif type_code == "manager":
             return Manager()
-        elif employee_type == "salesperson":
-            return Salesperson()
+        elif type_code == "salesman":
+            return Salesman()
         else:
-            raise NotImplementedError(f"Employee cannot be of type {employee_type}")
-
+            raise ValueError(f"Employee cannot be of type {type_code}")
+    
     def __str__(self):
         return f"{self._name} ({self.capitalized_type})"
 
 
 class EmployeeType:
-    def __init__(self, value):
-        self._value = value
-
     def __str__(self):
-        return self._value
+        raise NotImplementedError("Subclasses must implement __str__ method")
 
 
 class Engineer(EmployeeType):
@@ -57,6 +45,6 @@ def __str__(self):
         return "manager"
 
 
-class Salesperson(EmployeeType):
+class Salesman(EmployeeType):
     def __str__(self):
-        return "salesperson"
+        return "salesman"

chapter12/tests/case06/test_case06_2.py

@@ -1,17 +1,22 @@
 import pytest
 
-from chapter12.src.case06.case06_2 import Employee
+from chapter12.src.case06.case06_2 import (
+    Employee,
+    Engineer,
+    Manager,
+    Salesman,
+)
 
 
 def test_employee_creation_with_valid_types():
     """유효한 타입으로 직원을 생성할 수 있는지 테스트"""
     valid_types = ["engineer", "manager", "salesman"]
+    expected_classes = [Engineer, Manager, Salesman]
 
-    for type_value in valid_types:
+    for i, type_value in enumerate(valid_types):
         employee = Employee("Test Employee", type_value)
         assert employee._name == "Test Employee"
-        assert employee._type == type_value
-        assert employee.type == type_value  # getter 테스트
+        assert isinstance(employee._type, expected_classes[i])
 
 
 def test_employee_creation_with_invalid_type():
@@ -25,15 +30,15 @@ def test_employee_creation_with_invalid_type():
 def test_employee_type_setter():
     """type 속성의 setter가 올바르게 작동하는지 테스트"""
     employee = Employee("John Doe", "engineer")
-    assert employee.type == "engineer"
+    assert isinstance(employee.type, Engineer)
 
     employee.type = "manager"
-    assert employee.type == "manager"
-    assert employee._type == "manager"
+    assert isinstance(employee.type, Manager)
 
-    # 주의: setter는 타입 검증을 하지 않음
-    employee.type = "developer"
-    assert employee.type == "developer"
+    # 유효하지 않은 타입으로 설정 시도
+    with pytest.raises(ValueError) as excinfo:
+        employee.type = "developer"
+    assert "Employee cannot be of type developer" in str(excinfo.value)
 
 
 def test_employee_capitalized_type():
@@ -58,3 +63,14 @@ def test_employee_string_representation():
 
     employee = Employee("Bob Johnson", "salesman")
     assert str(employee) == "Bob Johnson (Salesman)"
+
+
+def test_employee_type_classes():
+    """EmployeeType 서브클래스들이 올바르게 작동하는지 테스트"""
+    engineer = Engineer()
+    manager = Manager()
+    salesman = Salesman()
+
+    assert str(engineer) == "engineer"
+    assert str(manager) == "manager"
+    assert str(salesman) == "salesman"