ELI-674 - tweaks to validator

Author: Karthikeyannhs

src/rules_validation_api/app.py

@@ -76,54 +76,57 @@ def main() -> None:  # pragma: no cover
 
 
 def display_current_iteration(result: RulesValidation) -> None:
-    no_of_iterations = 0
+    config = result.campaign_config
+    iterations = config.iterations
+    is_campaign_live = config.campaign_live
+    today = datetime.now(tz=UTC).date()
 
-    # Current Iteration
-    try:
-        no_of_iterations = len(result.campaign_config.iterations)
-        current = result.campaign_config.current_iteration
-    except StopIteration:
-        current = None
-    is_campaign_live = result.campaign_config.campaign_live
+    no_of_iterations = len(iterations)
+    is_campaign_expired = config.end_date < today
+
+    # ---- Current Iteration ----
     if is_campaign_live:
         sys.stdout.write(f"{YELLOW}Campaign is {RESET}{GREEN}LIVE{RESET}\n")
-        if current is None:
-            sys.stdout.write(f"{YELLOW}No active iteration could be determined{RESET}\n")
-        else:
+        current = config.current_iteration
+        if current:
             sys.stdout.write(
                 f"{YELLOW}Current active Iteration Number: {RESET}{GREEN}{current.iteration_number}{RESET}\n"
             )
             sys.stdout.write(
                 f"{YELLOW}Current active Iteration's date&time: {RESET}{GREEN}{current.iteration_datetime}{RESET}\n"
             )
+        else:
+            sys.stdout.write(f"{YELLOW}No active iteration could be determined{RESET}\n")
 
     else:
-        sys.stdout.write(f"{YELLOW}Campaign is {RESET}{GREEN}NOT LIVE{RESET}\n")
+        sys.stdout.write(f"{YELLOW}Campaign is {RESET}{GREEN}NOT LIVE{RESET}")
 
-    # Next Iteration
-    try:
-        sorted_iterations = sorted(result.campaign_config.iterations, key=attrgetter("iteration_date"))
-        today = datetime.now(tz=UTC).date()
-        next_iteration = (
-            next(i for i in sorted_iterations if i.iteration_date > today) if sorted_iterations else None
-        )
-    except StopIteration:
-        next_iteration = None
+        if is_campaign_expired:
+            sys.stdout.write(f"{YELLOW}[EXPIRED on {config.end_date}]{RESET}\n")
+        else:
+            sys.stdout.write(f"{YELLOW}[To be STARTED on {RESET}{GREEN}{config.start_date}{RESET}{YELLOW}]{RESET}\n")
 
-    if next_iteration:
-        sys.stdout.write(
-            f"{YELLOW}Next active Iteration Number: {RESET}{GREEN}{next_iteration.iteration_number}{RESET}\n"
+    # ---- Next Iteration ----
+    if not is_campaign_expired:
+        sorted_iterations = sorted(iterations, key=attrgetter("iteration_date"))
+        next_iteration = next(
+            (i for i in sorted_iterations if i.iteration_date > today), None
         )
-        sys.stdout.write(
-            f"{YELLOW}Next active Iteration's date&time: {RESET}{GREEN}{next_iteration.iteration_datetime}{RESET}\n"
-        )
-    else:
-        sys.stdout.write(f"{YELLOW}No next active iteration could be determined{RESET}\n")
 
+        if next_iteration:
+            sys.stdout.write(
+                f"{YELLOW}Next active Iteration Number: {RESET}{GREEN}{next_iteration.iteration_number}{RESET}\n"
+            )
+            sys.stdout.write(
+                f"{YELLOW}Next active Iteration's date&time: {RESET}{GREEN}{next_iteration.iteration_datetime}{RESET}\n"
+            )
+        else:
+            sys.stdout.write(f"{YELLOW}No next active iteration could be determined{RESET}\n")
 
-    # Total no of iterations
-    sys.stdout.write(f"{YELLOW}Total iterations configured: {RESET}{GREEN}{no_of_iterations}{RESET}\n")
-
+    # ---- Total Iterations ----
+    sys.stdout.write(
+        f"{YELLOW}Total iterations configured: {RESET}{GREEN}{no_of_iterations}{RESET}\n"
+    )
 
 if __name__ == "__main__":  # pragma: no cover
     main()