Task 2

battery.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+class Battery(ABC):
+    def __init__(self):
+        pass
+
+    @abstractmethod
+    def needs_service(self):
+        pass

battery/nubbinBattery.py

@@ -0,0 +1,15 @@
+from abc import ABC
+from battery import Battery
+from datetime import datetime
+
+class NubbinBattery(Battery, ABC):
+    def __init__(self, last_service_date, current_date):
+        self.last_service_date = last_service_date
+        self.current_date = current_date
+        self.batteryServiceYears = 4
+
+    def needs_service(self):
+        if self.last_service_date - self.current_date < self.batteryServiceYears:
+            return True
+        else:
+            return False

battery/spindlerBattery.py

@@ -0,0 +1,16 @@
+from abc import ABC
+from battery import Battery
+from datetime import datetime
+
+class SpindlerBattery(Battery, ABC):
+
+    def __init__(self, last_service_date, current_date):
+        self.last_service_date = last_service_date
+        self.current_date = current_date
+        self.batteryServiceYears = 2
+
+    def needs_service(self):
+        if self.last_service_date - self.current_date < self.batteryServiceYears:
+            return True
+        else:
+            return False

car.py

@@ -1,9 +1,11 @@
 from abc import ABC, abstractmethod
-
+from engine import Engine
+from battery import Battery
 
 class Car(ABC):
-    def __init__(self, last_service_date):
-        self.last_service_date = last_service_date
+    def __init__(self, engine, battery):
+        self.engine = engine
+        self.battery = battery
 
     @abstractmethod
     def needs_service(self):

engine/capulet_engine.py

@@ -1,13 +1,16 @@
 from abc import ABC
+from engine import Engine
 
-from car import Car
-
-
-class CapuletEngine(Car, ABC):
+class CapuletEngine(Engine, ABC):
     def __init__(self, last_service_date, current_mileage, last_service_mileage):
         super().__init__(last_service_date)
+        self.service_miles = 30000
         self.current_mileage = current_mileage
         self.last_service_mileage = last_service_mileage
+        self.service_miles = service_miles
 
-    def engine_should_be_serviced(self):
-        return self.current_mileage - self.last_service_mileage > 30000
+    def needs_service(self):
+        if self.current_mileage - self.last_service_mileage < service_miles:
+            return True
+        else:
+            return False

engine/engine.py

@@ -0,0 +1,10 @@
+from abc import ABC, abstractmethod
+
+
+class Engine(ABC):
+    def __init__(self):
+        pass
+
+    @abstractmethod
+    def needs_service(self):
+        pass

engine/model/calliope.py

@@ -1,12 +1,13 @@
 from datetime import datetime
 
 from engine.capulet_engine import CapuletEngine
+from battery.spindlerBattery import SpindlerBattery
+from car import Car
 
+class Calliope(Car):
 
-class Calliope(CapuletEngine):
-    def needs_service(self):
-        service_threshold_date = self.last_service_date.replace(year=self.last_service_date.year + 2)
-        if service_threshold_date < datetime.today().date() or self.engine_should_be_serviced():
-            return True
-        else:
-            return False
+    def __init(self, last_service_date, current_mileage):
+        super().__init__(last_service_date, current_mileage)  # Call the constructors of parent classes
+        self.current_date = datetime.today().date()
+        self.engine = CapuletEngine (last_service_date, current_mileage)
+        self.battery = SpindlerBattery (last_service_date, self.current_date)

engine/model/glissade.py

@@ -1,12 +1,13 @@
 from datetime import datetime
-
 from engine.willoughby_engine import WilloughbyEngine
+from battery.spindlerBattery import SpindlerBattery
+from car import Car
+
 
+class Glissade(Car):
+    def __init(self, last_service_date, current_mileage):
+        super().__init__(last_service_date, current_mileage)  # Call the constructors of parent classes
+        self.current_date = datetime.today().date()
+        self.engine =  WilloughbyEngine(last_service_date, current_mileage)
+        self.battery = SpindlerBattery (last_service_date, self.current_date)
 
-class Glissade(WilloughbyEngine):
-    def needs_service(self):
-        service_threshold_date = self.last_service_date.replace(year=self.last_service_date.year + 2)
-        if service_threshold_date < datetime.today().date() or self.engine_should_be_serviced():
-            return True
-        else:
-            return False

engine/model/palindrome.py

@@ -1,12 +1,12 @@
 from datetime import datetime
-
+from battery.spindlerBattery import SpindlerBattery
+from car import Car
 from engine.sternman_engine import SternmanEngine
 
 
 class Palindrome(SternmanEngine):
-    def needs_service(self):
-        service_threshold_date = self.last_service_date.replace(year=self.last_service_date.year + 4)
-        if service_threshold_date < datetime.today().date() or self.engine_should_be_serviced():
-            return True
-        else:
-            return False
+    def __init(self, last_service_date, current_mileage):
+        super().__init__(last_service_date, current_mileage)  # Call the constructors of parent classes
+        self.current_date = datetime.today().date()
+        self.engine =  SternmanEngine(last_service_date, current_mileage)
+        self.battery = SpindlerBattery (last_service_date, self.current_date)

engine/model/rorschach.py

@@ -1,9 +1,16 @@
 from datetime import datetime
-
+from battery.nubbinBattery import NubbinBattery
+from car import Car
 from engine.willoughby_engine import WilloughbyEngine
 
 
 class Rorschach(WilloughbyEngine):
+    def __init(self, last_service_date, current_mileage):
+        super().__init__(last_service_date, current_mileage)  # Call the constructors of parent classes
+        self.current_date = datetime.today().date()
+        self.engine =  WilloughbyEngine(last_service_date, current_mileage)
+        self.battery = NubbinBattery (last_service_date, self.current_date)
+
     def needs_service(self):
         service_threshold_date = self.last_service_date.replace(year=self.last_service_date.year + 4)
         if service_threshold_date < datetime.today().date() or self.engine_should_be_serviced():

engine/model/thovex.py

@@ -1,9 +1,16 @@
 from datetime import datetime
-
+from battery.nubbinBattery import NubbinBattery
+from car import Car
 from engine.capulet_engine import CapuletEngine
 
 
 class Thovex(CapuletEngine):
+    def __init(self, last_service_date, current_mileage):
+        super().__init__(last_service_date, current_mileage)  # Call the constructors of parent classes
+        self.current_date = datetime.today().date()
+        self.engine =  CapuletEngine(last_service_date, current_mileage)
+        self.battery = NubbinBattery (last_service_date, self.current_date)
+
     def needs_service(self):
         service_threshold_date = self.last_service_date.replace(year=self.last_service_date.year + 4)
         if service_threshold_date < datetime.today().date() or self.engine_should_be_serviced():

engine/sternman_engine.py

@@ -1,15 +1,15 @@
 from abc import ABC
+from engine import Engine 
 
-from car import Car
-
-
-class SternmanEngine(Car, ABC):
-    def __init__(self, last_service_date, warning_light_is_on):
+class SternmanEngine(Engine, ABC):
+    def __init__(self, last_service_date, current_mileage, last_service_mileage):
         super().__init__(last_service_date)
-        self.warning_light_is_on = warning_light_is_on
+        self.current_mileage = current_mileage
+        self.last_service_mileage = last_service_mileage
+        self.isWarningLightOn = False
 
-    def engine_should_be_serviced(self):
-        if self.warning_light_is_on:
+    def needs_service(self):
+        if self.isWarningLightOn == True:
             return True
         else:
             return False

engine/willoughby_engine.py

@@ -1,13 +1,16 @@
 from abc import ABC
+from engine import Engine
 
-from car import Car
 
-
-class WilloughbyEngine(Car, ABC):
-    def __init__(self, last_service_date, current_mileage, last_service_mileage):
+class WilloughbyEngine(Engine, ABC):
+    def __init__(self, last_service_date, current_mileage, last_service_mileage, service_miles):
         super().__init__(last_service_date)
         self.current_mileage = current_mileage
         self.last_service_mileage = last_service_mileage
+        self.service_miles = service_miles
 
-    def engine_should_be_serviced(self):
-        return self.current_mileage - self.last_service_mileage > 60000
+    def needs_service(self):
+        if self.current_mileage - self.last_service_mileage < service_miles:
+            return True
+        else:
+            return False