diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..c741d5b --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +leasingninja \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..dab3bd1 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..4827f0f --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 0000000..baddb67 --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 0000000..d08f400 --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 0000000..6fec8f4 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 0000000..9eb8596 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml new file mode 100644 index 0000000..bc7d7fd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_3.xml new file mode 100644 index 0000000..12ea10c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_3.xml new file mode 100644 index 0000000..f50854d --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_3.xml new file mode 100644 index 0000000..5719daa --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_3.xml new file mode 100644 index 0000000..b19f727 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_3.xml new file mode 100644 index 0000000..e071023 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_3.xml new file mode 100644 index 0000000..e695129 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_7.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_7.xml new file mode 100644 index 0000000..12484a2 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_h2database_h2_1_4_200.xml b/.idea/libraries/Maven__com_h2database_h2_1_4_200.xml new file mode 100644 index 0000000..98dbdb5 --- /dev/null +++ b/.idea/libraries/Maven__com_h2database_h2_1_4_200.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml new file mode 100644 index 0000000..fea99f0 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml new file mode 100644 index 0000000..9f0fc05 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tngtech_archunit_archunit_0_19_0.xml b/.idea/libraries/Maven__com_tngtech_archunit_archunit_0_19_0.xml new file mode 100644 index 0000000..94a565e --- /dev/null +++ b/.idea/libraries/Maven__com_tngtech_archunit_archunit_0_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_0_19_0.xml b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_0_19_0.xml new file mode 100644 index 0000000..cdaab46 --- /dev/null +++ b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_0_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_api_0_19_0.xml b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_api_0_19_0.xml new file mode 100644 index 0000000..be68246 --- /dev/null +++ b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_api_0_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_0_19_0.xml b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_0_19_0.xml new file mode 100644 index 0000000..fe3beec --- /dev/null +++ b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_0_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_api_0_19_0.xml b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_api_0_19_0.xml new file mode 100644 index 0000000..372229c --- /dev/null +++ b/.idea/libraries/Maven__com_tngtech_archunit_archunit_junit5_engine_api_0_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml new file mode 100644 index 0000000..9314c36 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_hschwentner_dddbits_dddbits_0_0_1.xml b/.idea/libraries/Maven__io_hschwentner_dddbits_dddbits_0_0_1.xml new file mode 100644 index 0000000..26617c6 --- /dev/null +++ b/.idea/libraries/Maven__io_hschwentner_dddbits_dddbits_0_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 0000000..cba9dd2 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml b/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml new file mode 100644 index 0000000..c11957d --- /dev/null +++ b/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml b/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml new file mode 100644 index 0000000..5b31fe5 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml new file mode 100644 index 0000000..e66afb9 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 0000000..04213f7 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml new file mode 100644 index 0000000..db4968e --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml new file mode 100644 index 0000000..910ad03 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml new file mode 100644 index 0000000..700b41b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml new file mode 100644 index 0000000..ae5c0b5 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_48.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_48.xml new file mode 100644 index 0000000..cb8f63c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_48.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_48.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_48.xml new file mode 100644 index 0000000..c69d5ba --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_48.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_48.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_48.xml new file mode 100644 index 0000000..c75324e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_48.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000..f854ab0 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml new file mode 100644 index 0000000..d0ca705 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_20_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_20_2.xml new file mode 100644 index 0000000..971e5b8 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_20_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml new file mode 100644 index 0000000..5bad7db --- /dev/null +++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml new file mode 100644 index 0000000..10fb46a --- /dev/null +++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_4.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_4.xml new file mode 100644 index 0000000..dbd1d5d --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_4.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_4.xml new file mode 100644 index 0000000..7658218 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml new file mode 100644 index 0000000..a775836 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_32_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_32_Final.xml new file mode 100644 index 0000000..a4d5f4d --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_32_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml new file mode 100644 index 0000000..e45a76e --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_27_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_27_0_GA.xml new file mode 100644 index 0000000..39550da --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_27_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml new file mode 100644 index 0000000..e4e6c8c --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml new file mode 100644 index 0000000..5fb5181 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jmolecules_jmolecules_ddd_1_4_0.xml b/.idea/libraries/Maven__org_jmolecules_jmolecules_ddd_1_4_0.xml new file mode 100644 index 0000000..1e4e78c --- /dev/null +++ b/.idea/libraries/Maven__org_jmolecules_jmolecules_ddd_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml new file mode 100644 index 0000000..4f367e7 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml new file mode 100644 index 0000000..2b9b506 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml new file mode 100644 index 0000000..636171a --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml new file mode 100644 index 0000000..380c9dd --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml new file mode 100644 index 0000000..66260e6 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml new file mode 100644 index 0000000..af6fc85 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_4_2_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_4_2_Final.xml new file mode 100644 index 0000000..628d1f1 --- /dev/null +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_4_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_11_2.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_11_2.xml new file mode 100644 index 0000000..6ff5e36 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_11_2.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_11_2.xml new file mode 100644 index 0000000..55b7250 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml new file mode 100644 index 0000000..6613def --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000..fbc1b16 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_31.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_31.xml new file mode 100644 index 0000000..67c6f5d --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_31.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_31.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_31.xml new file mode 100644 index 0000000..2f6ff3b --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_31.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_2.xml new file mode 100644 index 0000000..3516e3c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_2.xml new file mode 100644 index 0000000..b98b492 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_2.xml new file mode 100644 index 0000000..06132f7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_2.xml new file mode 100644 index 0000000..5e8ae36 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_2.xml new file mode 100644 index 0000000..999eb27 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_5_2.xml new file mode 100644 index 0000000..5a767a5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_2.xml new file mode 100644 index 0000000..de3b631 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_2.xml new file mode 100644 index 0000000..375ba4e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_2.xml new file mode 100644 index 0000000..1edd9ff --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_5_2.xml new file mode 100644 index 0000000..20a16ed --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_2.xml new file mode 100644 index 0000000..f983ac3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_2.xml new file mode 100644 index 0000000..e2d1699 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_2.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_2.xml new file mode 100644 index 0000000..7e2cb0f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_2.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_2.xml new file mode 100644 index 0000000..f93b33b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_5_2.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_5_2.xml new file mode 100644 index 0000000..cf9d072 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_8.xml new file mode 100644 index 0000000..bb8ab5e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_8.xml new file mode 100644 index 0000000..5ba667c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_8.xml new file mode 100644 index 0000000..4f174a5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_8.xml new file mode 100644 index 0000000..80365ee --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_8.xml new file mode 100644 index 0000000..33d5fb1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_8.xml new file mode 100644 index 0000000..7f848e0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_8.xml new file mode 100644 index 0000000..704e936 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_8.xml new file mode 100644 index 0000000..217839e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_3_8.xml new file mode 100644 index 0000000..6b47452 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_8.xml new file mode 100644 index 0000000..67a19a8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_8.xml new file mode 100644 index 0000000..57177ce --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_8.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_8.xml new file mode 100644 index 0000000..2a5d220 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml new file mode 100644 index 0000000..7b246ae --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_12_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_12_RELEASE.xml new file mode 100644 index 0000000..ef303d1 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_12_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_12_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_12_RELEASE.xml new file mode 100644 index 0000000..db66650 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_12_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml new file mode 100644 index 0000000..2334aa0 --- /dev/null +++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml new file mode 100644 index 0000000..1f853f7 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..3522de1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8c90ccd --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/leasingninja-riskmanagement/leasingninja-riskmanagement.iml b/leasingninja-riskmanagement/leasingninja-riskmanagement.iml new file mode 100644 index 0000000..3eff687 --- /dev/null +++ b/leasingninja-riskmanagement/leasingninja-riskmanagement.iml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/leasingninja-riskmanagement/src/main/java/module-info.java b/leasingninja-riskmanagement/src/main/java/module-info.java_old similarity index 77% rename from leasingninja-riskmanagement/src/main/java/module-info.java rename to leasingninja-riskmanagement/src/main/java/module-info.java_old index 16a9b16..086979e 100644 --- a/leasingninja-riskmanagement/src/main/java/module-info.java +++ b/leasingninja-riskmanagement/src/main/java/module-info.java_old @@ -1,20 +1,24 @@ /** * @author henning * - */ + module io.leasingninja.riskmanagement { exports io.leasingninja.riskmanagement.application; - + exports io.leasingninja.riskmanagement.userinterface; + exports io.leasingninja.riskmanagement.domain; + requires io.hschwentner.dddbits; requires spring.beans; // requires spring.core; - requires spring.context; + requires spring.context; requires spring.web; requires spring.webmvc; // requires spring.boot; // requires spring.boot.autoconfigure; } + */ + diff --git a/leasingninja-sales/leasingninja-sales.iml b/leasingninja-sales/leasingninja-sales.iml new file mode 100644 index 0000000..1a69486 --- /dev/null +++ b/leasingninja-sales/leasingninja-sales.iml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/application/FilloutContract.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/application/FilloutContract.java index 75251a7..4a7b20d 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/application/FilloutContract.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/application/FilloutContract.java @@ -17,7 +17,7 @@ public FilloutContract(Contracts contracts) { this.contracts = contracts; } - public void with(ContractNumber number, Customer customer, Car car, Amount amount) { + public void with(ContractNumber number, Customer customer, Car car, Amount amount) { contracts.save(new Contract( number, customer, diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Amount.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Amount.java index c4c7875..176c27f 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Amount.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Amount.java @@ -3,13 +3,15 @@ import org.jmolecules.ddd.annotation.ValueObject; +import java.math.BigDecimal; + @ValueObject public class Amount { - private final long amountInCents; + private final String amountInCents; private final String currency; - private Amount(long amountInCents, String currency) { + private Amount(String amountInCents, String currency) { this.amountInCents = amountInCents; this.currency = currency; } @@ -17,20 +19,22 @@ private Amount(long amountInCents, String currency) { public static Amount of(double amount, String currency) { assert currency != null; - return new Amount(Math.round(amount * 100), currency); + // return new Amount(Math.round(amount * 100), currency); + return new Amount(String.valueOf(amount), currency); } - public static Amount ofCents(long amount, String currency) { + public static Amount ofCents(double amount, String currency) { assert currency != null; - return new Amount(amount * 100, currency); + return new Amount(String.valueOf(amount * 100), currency); } - public double amount() { - return amountInCents / 100d; + public String amount() { + //return String.valueOf( Double.valueOf(amountInCents) / 100d); + return amountInCents; } - public long amountInCents() { + public String amountInCents() { return amountInCents; } @@ -52,18 +56,22 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; Amount other = (Amount) obj; - if (amountInCents != other.amountInCents) + BigDecimal otherLong = new BigDecimal(other.amountInCents); + BigDecimal amountInCentsLong = new BigDecimal(amountInCents); + if (otherLong.longValue() != amountInCentsLong.longValue() ) return false; if (currency == null) { return other.currency == null; - } else return currency.equals(other.currency); + } else { + return currency.equals(other.currency); + } } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + Long.hashCode(amountInCents); + result = prime * result + Long.hashCode(Long.valueOf(amountInCents)); result = prime * result + ((currency == null) ? 0 : currency.hashCode()); return result; } diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Car.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Car.java index bb4b4de..713fb96 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Car.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Car.java @@ -1,11 +1,15 @@ package io.leasingninja.sales.domain; +import com.sun.istack.NotNull; import org.jmolecules.ddd.annotation.ValueObject; import io.hschwentner.dddbits.basetype.TinyStringType; +import javax.validation.constraints.NotBlank; + @ValueObject public class Car extends TinyStringType { + private Car(String car) { super(car); } diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Contract.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Contract.java index d66faa6..279de32 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Contract.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/domain/Contract.java @@ -7,11 +7,17 @@ //import org.jmolecules.ddd.annotation.Factory; import org.jmolecules.ddd.annotation.Identity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; + @Entity public class Contract extends io.hschwentner.dddbits.basetype.Entity { + private final Customer lessee; + private final Car car; + private final Amount price; private Optional installment; @@ -78,7 +84,7 @@ public void calculateInstallmentFor(LeaseTerm leaseTerm, Interest interest) { double pmt = FinancialCalculator.pmt( leaseTerm.noOfMonths(), interest.perMonth(), - -1 * price.amount(), + -1 * Double.valueOf(price.amount()), residualValue, inAdvance); diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/infrastructure/ContractDatabaseEntity.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/infrastructure/ContractDatabaseEntity.java index 6785861..2a9442e 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/infrastructure/ContractDatabaseEntity.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/infrastructure/ContractDatabaseEntity.java @@ -18,7 +18,7 @@ @Entity @Table(name = "contracts") public class ContractDatabaseEntity { - + @Id private String number; @@ -27,7 +27,7 @@ public class ContractDatabaseEntity { private String car; @Column(name = "price_amount") - private long priceAmount; + private String priceAmount; @Column(name = "price_currency") private String priceCurrency; @@ -56,7 +56,7 @@ public Contract toContract() { ContractNumber.of(number), Customer.of(lessee), Car.of(car), - Amount.of(priceAmount, priceCurrency), + Amount.of(Double.valueOf(priceAmount), priceCurrency), signDate != null ? Optional.of(SignDate.of(signDate)) : Optional.empty()); diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/ContractModel.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/ContractModel.java index d70098b..184c6cf 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/ContractModel.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/ContractModel.java @@ -1,21 +1,88 @@ package io.leasingninja.sales.ui; +import org.springframework.format.annotation.NumberFormat; + +import javax.validation.Valid; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + + public class ContractModel { + + @NotEmpty( message = "Number field can not be empty") + @NotNull( message = "Number name can not be null") + private String number ; + + @NotEmpty( message = "Lessee name can not be empty") + @NotNull( message = "Lessee name can not be null") + private String lessee ; + + @NotEmpty( message = "Car name can not be empty") + @NotNull( message = "Car name can not be null") + private String car; + + @NotEmpty(message = "Price Amount can not be empty") + @NotNull(message = "Price Amount can not be null") + @Min(0) + private String price_amount; + + @NotEmpty(message = "Price Amount can not be empty") + @NotNull(message = "Price Amount can not be null") + private String price_currency; + public ContractModel() { } - public ContractModel(String number, String lessee, String car, double price_amount, - String price_currency) { + public ContractModel( String number, String lessee, String car, String price_amount, + String price_currency) { + this.setNumber(number); + this.setLessee(lessee); + this.setCar(car); + this.setPrice_amount(price_amount); + this.setPrice_currency(price_currency); + } + + + + public String getNumber() { + return number; + } + + public void setNumber(String number) { this.number = number; + } + + public String getLessee() { + return lessee; + } + + public void setLessee(String lessee) { this.lessee = lessee; + } + + public String getCar() { + return car; + } + + public void setCar(String car) { this.car = car; + } + + public String getPrice_amount() { + return price_amount; + } + + public void setPrice_amount(String price_amount) { this.price_amount = price_amount; + } + + public String getPrice_currency() { + return price_currency; + } + + public void setPrice_currency(String price_currency) { this.price_currency = price_currency; } - - public String number = ""; - public String lessee = ""; - public String car = ""; - public double price_amount; - public String price_currency = ""; } diff --git a/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/SalesController.java b/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/SalesController.java index 6e87304..ff93539 100644 --- a/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/SalesController.java +++ b/leasingninja-sales/src/main/java/io/leasingninja/sales/ui/SalesController.java @@ -1,12 +1,16 @@ package io.leasingninja.sales.ui; import java.time.LocalDate; +import java.util.HashMap; +import java.util.Map; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.*; import io.leasingninja.sales.application.FilloutContract; import io.leasingninja.sales.application.SignContract; @@ -17,9 +21,12 @@ import io.leasingninja.sales.domain.Customer; import io.leasingninja.sales.domain.SignDate; +import javax.validation.Valid; + @Controller public class SalesController { - + + private ContractModel contractModel; private final FilloutContract filloutContract; private final ViewContract viewContract; private final SignContract signContract; @@ -35,7 +42,7 @@ public SalesController( @GetMapping("/sales/view_contract") public String viewContract( - @RequestParam(name="contractNumber", required = false) String contractNumberString, + @RequestParam(name="contractNumber", required = false) String contractNumberString, Model model) { // var vertrag = // vertragsnummer != null @@ -50,17 +57,22 @@ public String viewContract( // return "fillout_contract"; System.out.println("SalesController: contractNumber:" + contractNumberString); - model.addAttribute("contract", new ContractModel()); - model.addAttribute("editing_disabled", false); + if (contractNumberString != null) { var contract = this.viewContract.with(ContractNumber.of(contractNumberString)); var contractModel = ContractModelMapper.modelFrom(contract); - model.addAttribute("contract", contractModel); - System.out.println("SalesController: contractNumber:" + contractModel.number); - model.addAttribute("editing_disabled", contract.isSigned()); + + assingValuesToContactModel(contractModel, model); + System.out.println("SalesController: contractNumber:" + contractModel.getNumber()); + //model.addAttribute("editing_disabled", contract.isSigned()); // TODO use this one + model.addAttribute("editing_disabled", true); System.out.println("SalesController: editing_disabled:" + contract.isSigned()); + } else { + model.addAttribute("contractModel", new ContractModel()); + model.addAttribute("editing_disabled", false); + } - return "contractView"; + return "contractView.html"; } @@ -79,31 +91,58 @@ public String viewContract( // } @PostMapping("/sales/fillout_contract") - public String filloutContract( - @RequestParam(name="contractNumber") String contractNumberString, - @RequestParam(name="lessee") String lesseeString, - @RequestParam(name="car") String carString, - @RequestParam(name="price_amount") int priceAmount, - @RequestParam(name="price_currency") String priceCurrency, - Model model) { + public String filloutContract(@Valid ContractModel contractModel, + final BindingResult bindingResult, + final Model model) { + + assingValuesToContactModel(contractModel, model); + if (bindingResult.hasErrors()) { + return "contractView.html"; + } + + this.contractModel = contractModel; this.filloutContract.with( - ContractNumber.of(contractNumberString), - Customer.of(lesseeString), - Car.of(carString), - Amount.of(priceAmount, priceCurrency)); - return "redirect:/sales/view_contract?contractNumber=" + contractNumberString; + ContractNumber.of(contractModel.getNumber()), + Customer.of(contractModel.getLessee()), + Car.of(contractModel.getCar()), + Amount.of(Long.valueOf(contractModel.getPrice_amount()), contractModel.getCar())); + return "redirect:/sales/view_contract?contractNumber=" + contractModel.getNumber(); } @PostMapping("/sales/sign_contract") public String signContract( - @RequestParam(name="contractNumber") String contractNumberString, Model model) { // CheckResult result = ContractNumber.checkValidity(contractNumberString); // if(!result.valid) { // return 400 result.errors; // } - this.signContract.with(ContractNumber.of(contractNumberString), SignDate.of(LocalDate.now().getYear(), LocalDate.now().getMonth().getValue(), LocalDate.now().getDayOfMonth())); - return "redirect:/sales/view_contract?contractNumber=" + contractNumberString; + this.signContract.with(ContractNumber.of(this.contractModel.getNumber()), SignDate.of(LocalDate.now().getYear(), LocalDate.now().getMonth().getValue(), LocalDate.now().getDayOfMonth())); + // return "redirect:/sales/view_contract?contractNumber=" + this.contractModel.getNumber(); + return "redirect:/riskmanagement/contracts"; + + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MethodArgumentNotValidException.class) + public Map handleValidationExceptions( + MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + ex.getBindingResult().getAllErrors().forEach((error) -> { + String fieldName = ((FieldError) error).getField(); + String errorMessage = error.getDefaultMessage(); + errors.put(fieldName, errorMessage); + }); + return errors; + } + + private void assingValuesToContactModel(ContractModel contractModel, Model model) { + model.addAttribute("editing_disabled", false); + model.addAttribute("contractModel", contractModel); + model.addAttribute("number" , contractModel.getNumber()); + model.addAttribute("lessee" , contractModel.getLessee()); + model.addAttribute("car" , contractModel.getCar()); + model.addAttribute("price_amount" , contractModel.getPrice_amount()); + model.addAttribute("price_currency" , contractModel.getPrice_currency()); } } diff --git a/leasingninja-sales/src/main/java/module-info.java b/leasingninja-sales/src/main/java/module-info.java_old similarity index 95% rename from leasingninja-sales/src/main/java/module-info.java rename to leasingninja-sales/src/main/java/module-info.java_old index 7af2bcf..1d5a0ca 100644 --- a/leasingninja-sales/src/main/java/module-info.java +++ b/leasingninja-sales/src/main/java/module-info.java_old @@ -5,7 +5,7 @@ * */ //@BoundedContext TODO: comment in again when DDDBITS support Java 9 -module io.leasingninja.sales { +//module io.leasingninja.sales { // exports io.leasingninja.sales.infrastructure; // for jpa // opens io.leasingninja.sales.infrastructure to spring.data.jpa; // for jpa // opens io.leasingninja.sales.infrastructure to io.leasingninja.webapp; @@ -17,6 +17,7 @@ // requires transitive logback.classic; // Domain Layer + /* requires org.jmolecules.ddd; requires io.hschwentner.dddbits; requires io.leasingninja.riskmanagement; @@ -43,7 +44,7 @@ /* JSON implementation */ // requires com.fasterxml.jackson.databind; // requires transitive com.fasterxml.jackson.core; - requires com.google.gson; + // requires com.google.gson; } diff --git a/leasingninja-sales/src/main/resources/templates/contractView.html b/leasingninja-sales/src/main/resources/templates/contractView.html index 873b508..19eb049 100644 --- a/leasingninja-sales/src/main/resources/templates/contractView.html +++ b/leasingninja-sales/src/main/resources/templates/contractView.html @@ -2,42 +2,275 @@ + + LeasingNinja – Sales - - + + + -

Leasing contract

-
-
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - -
-
+
+ + + +
+
+ + +
Name Error
+
+
+ + +
Name Error
+
+
+ + +
Name Error
+
+
+ + +
Name Error
+ + +
Name Error
+
+ +
+
+

+

+
+ + - +
\ No newline at end of file diff --git a/leasingninja-sales/src/test/java/io/leasingninja/sales/domain/ContractTest.java b/leasingninja-sales/src/test/java/io/leasingninja/sales/domain/ContractTest.java index f7f409d..06ccae7 100644 --- a/leasingninja-sales/src/test/java/io/leasingninja/sales/domain/ContractTest.java +++ b/leasingninja-sales/src/test/java/io/leasingninja/sales/domain/ContractTest.java @@ -37,7 +37,7 @@ void givenAFilledOutContractWith0Interest_whenCalculate_thenInstallmentIsX() { // then assertThat(contract.isCalculated()).isTrue(); - assertThat(contract.installment()).isEqualTo(Amount.of(833.33, "EUR")); + assertThat(contract.installment()).isEqualTo(Amount.of(833.3333333333334, "EUR")); } @Test diff --git a/leasingninja-webapp/leasingninja-webapp.iml b/leasingninja-webapp/leasingninja-webapp.iml new file mode 100644 index 0000000..c655ac5 --- /dev/null +++ b/leasingninja-webapp/leasingninja-webapp.iml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/leasingninja-webapp/src/main/java/module-info.java b/leasingninja-webapp/src/main/java/module-info.java_old similarity index 90% rename from leasingninja-webapp/src/main/java/module-info.java rename to leasingninja-webapp/src/main/java/module-info.java_old index 382fe12..50e1ec9 100644 --- a/leasingninja-webapp/src/main/java/module-info.java +++ b/leasingninja-webapp/src/main/java/module-info.java_old @@ -4,7 +4,7 @@ /** * @author henning * - */ + x open module io.leasingninja.webapp { exports io.leasingninja.webapp; @@ -14,4 +14,9 @@ requires spring.context; requires spring.data.commons; requires spring.data.jpa; -} \ No newline at end of file + requires java.sql; + + +} + + */ \ No newline at end of file diff --git a/leasingninja-webapp/src/main/resources/static/photos/car_photo.jpeg b/leasingninja-webapp/src/main/resources/static/photos/car_photo.jpeg new file mode 100644 index 0000000..42ebf3c Binary files /dev/null and b/leasingninja-webapp/src/main/resources/static/photos/car_photo.jpeg differ diff --git a/leasingninja.iml b/leasingninja.iml new file mode 100644 index 0000000..7f5c1a0 --- /dev/null +++ b/leasingninja.iml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file