From d23ea86ccfe5b418ef2d4a32276f6cfb61afd415 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Thu, 26 May 2022 21:18:57 +0200
Subject: [PATCH] Added logic to answer questions of new command dialog by flag
 arguments

---
 src/cpl_cli/command/new_service.py        | 46 +++++++++++++++--------
 src/cpl_cli/startup_argument_extension.py |  6 ++-
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py
index 0f6ccac5..f8b5781e 100644
--- a/src/cpl_cli/command/new_service.py
+++ b/src/cpl_cli/command/new_service.py
@@ -169,22 +169,22 @@ class NewService(CommandABC):
         Gets project information's from user
         :return:
         """
-        if not is_unittest:
-            result = Console.read('Do you want to use application base? (y/n) ')
-            if result.lower() == 'y':
-                self._use_application_api = True
+        if self._use_application_api or self._use_startup or self._use_service_providing or self._use_async:
+            Console.set_foreground_color(ForegroundColorEnum.default)
+            Console.write_line('Skipping question due to given flags')
+            return
 
-                result = Console.read('Do you want to use startup? (y/n) ')
-                if result.lower() == 'y':
-                    self._use_startup = True
-            else:
-                result = Console.read('Do you want to use service providing? (y/n) ')
-                if result.lower() == 'y':
-                    self._use_service_providing = True
-                
-        result = Console.read('Do you want to use async? (y/n) ')
-        if result.lower() == 'y':
-            self._use_async = True
+        if not is_unittest:
+            self._use_application_api = Console.read('Do you want to use application base? (y/n) ').lower() == 'y'
+
+        if not is_unittest and self._use_application_api:
+            self._use_startup = Console.read('Do you want to use startup? (y/n) ').lower() == 'y'
+
+        if not is_unittest and not self._use_application_api:
+            self._use_service_providing = Console.read('Do you want to use service providing? (y/n) ').lower() == 'y'
+
+        if not self._use_async:
+            self._use_async = Console.read('Do you want to use async? (y/n) ').lower() == 'y'
 
         Console.set_foreground_color(ForegroundColorEnum.default)
 
@@ -276,6 +276,22 @@ class NewService(CommandABC):
         :param args:
         :return:
         """
+        if 'async' in args:
+            self._use_async = True
+            args.remove('async')
+
+        if 'application-base' in args:
+            self._use_application_api = True
+            args.remove('application-base')
+
+        if 'startup' in args:
+            self._use_startup = True
+            args.remove('startup')
+
+        if 'service-providing' in args:
+            self._use_service_providing = True
+            args.remove('service-providing')
+
         console = self._config.get_configuration(ProjectTypeEnum.console.value)
         library = self._config.get_configuration(ProjectTypeEnum.library.value)
         unittest = self._config.get_configuration(ProjectTypeEnum.unittest.value)
diff --git a/src/cpl_cli/startup_argument_extension.py b/src/cpl_cli/startup_argument_extension.py
index 92287027..64710b11 100644
--- a/src/cpl_cli/startup_argument_extension.py
+++ b/src/cpl_cli/startup_argument_extension.py
@@ -86,7 +86,11 @@ class StartupArgumentExtension(StartupExtensionABC):
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'new', ['n', 'N'], NewService, True) \
             .add_console_argument(ArgumentTypeEnum.Variable, '', 'console', ['c', 'C'], ' ') \
             .add_console_argument(ArgumentTypeEnum.Variable, '', 'library', ['l', 'L'], ' ') \
-            .add_console_argument(ArgumentTypeEnum.Variable, '', 'unittest', ['ut', 'UT'], ' ')
+            .add_console_argument(ArgumentTypeEnum.Variable, '', 'unittest', ['ut', 'UT'], ' ') \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'async', ['a', 'A']) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'application-base', ['ab', 'AB']) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'startup', ['s', 'S']) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'service-providing', ['sp', 'SP'])
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'publish', ['p', 'P'], PublishService, True, validators=[ProjectValidator])
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'remove', ['r', 'R'], RemoveService, True, validators=[WorkspaceValidator]) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'simulate', ['s', 'S'])