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/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..52aab27
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..d28035a
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ h2.unified
+ true
+ org.h2.Driver
+ jdbc:h2:~/test
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..63e9001
--- /dev/null
+++ b/.idea/encodings.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/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_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
new file mode 100644
index 0000000..3aa8175
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
new file mode 100644
index 0000000..bd0d979
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
new file mode 100644
index 0000000..08c0010
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.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_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
new file mode 100644
index 0000000..ea31a53
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.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_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
new file mode 100644
index 0000000..50b2736
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.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_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
new file mode 100644
index 0000000..6eac973
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_h2database_h2_1_4_193.xml b/.idea/libraries/Maven__com_h2database_h2_1_4_193.xml
new file mode 100644
index 0000000..579da78
--- /dev/null
+++ b/.idea/libraries/Maven__com_h2database_h2_1_4_193.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
new file mode 100644
index 0000000..f19f6eb
--- /dev/null
+++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_opencsv_opencsv_5_2.xml b/.idea/libraries/Maven__com_opencsv_opencsv_5_2.xml
new file mode 100644
index 0000000..d058077
--- /dev/null
+++ b/.idea/libraries/Maven__com_opencsv_opencsv_5_2.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_11.xml b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml
new file mode 100644
index 0000000..c4e94e6
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
new file mode 100644
index 0000000..b8581a6
--- /dev/null
+++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
new file mode 100644
index 0000000..97e2291
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
new file mode 100644
index 0000000..84eb115
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 0000000..13afda2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file mode 100644
index 0000000..eab40b3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
new file mode 100644
index 0000000..be90656
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.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_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_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml
new file mode 100644
index 0000000..74f49f3
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml
new file mode 100644
index 0000000..768d1aa
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
new file mode 100644
index 0000000..b3d3858
--- /dev/null
+++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
new file mode 100644
index 0000000..1083023
--- /dev/null
+++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
new file mode 100644
index 0000000..5871c95
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
new file mode 100644
index 0000000..00de553
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml
new file mode 100644
index 0000000..2841d23
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
new file mode 100644
index 0000000..8ad4996
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.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_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
new file mode 100644
index 0000000..57e6ac4
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.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_37.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
new file mode 100644
index 0000000..7e39935
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.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_37.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
new file mode 100644
index 0000000..6a30056
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.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_16_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
new file mode 100644
index 0000000..8976500
--- /dev/null
+++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.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_jakarta_el_3_0_3.xml b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
new file mode 100644
index 0000000..ae5020d
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_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_3.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml
new file mode 100644
index 0000000..23fbd58
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml
new file mode 100644
index 0000000..67d5d9e
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
new file mode 100644
index 0000000..6b5496f
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.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_0_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml
new file mode 100644
index 0000000..1fd775b
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_18_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_18_Final.xml
new file mode 100644
index 0000000..ee0e5bf
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_18_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml
new file mode 100644
index 0000000..a9de551
--- /dev/null
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml
new file mode 100644
index 0000000..7d3834f
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_jandex_2_1_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_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
new file mode 100644
index 0000000..0b76247
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
new file mode 100644
index 0000000..7171153
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_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_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
new file mode 100644
index 0000000..ef160d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_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_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
new file mode 100644
index 0000000..fc4c644
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_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_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
new file mode 100644
index 0000000..45b4af3
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_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_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
new file mode 100644
index 0000000..f2699b9
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_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_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
new file mode 100644
index 0000000..c13a302
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
new file mode 100644
index 0000000..d2f4afa
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
new file mode 100644
index 0000000..6c02a63
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
new file mode 100644
index 0000000..af41e3b
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.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_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
new file mode 100644
index 0000000..0bf8cf2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
new file mode 100644
index 0000000..c4c54d6
--- /dev/null
+++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_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_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
new file mode 100644
index 0000000..27229ce
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
new file mode 100644
index 0000000..02b6812
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..158ddd9
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..d547da6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..0781af8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..0cfdca9
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..3a5b31d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..2d77ecd
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..1046f12
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..b2bec55
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..30cfcb1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..8353935
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..2aed09e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.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_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..af10dc8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..8465350
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..686327e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..c06da98
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..ff8f8ac
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..000f9ff
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..9b42a61
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ca7aa33
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..3194e8e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..e7d5de5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..2d2456d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..4fea859
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..a1290a5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..49c26c3
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_orm_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..5fa25dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..6c8bcb7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ae46cf0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..d584e24
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
new file mode 100644
index 0000000..006a8d3
--- /dev/null
+++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
new file mode 100644
index 0000000..e998675
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.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..22ffa33
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ad2716a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/selecao-java.iml b/.idea/selecao-java.iml
new file mode 100644
index 0000000..c7bfec0
--- /dev/null
+++ b/.idea/selecao-java.iml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HELP.md b/HELP.md
new file mode 100644
index 0000000..6b71fe2
--- /dev/null
+++ b/HELP.md
@@ -0,0 +1,28 @@
+# Read Me First
+The following was discovered as part of building this project:
+
+* The original package name 'com.arquivo.import-csv' is invalid and this project uses 'com.arquivo.importcsv' instead.
+
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/)
+* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/#build-image)
+* [Spring Web](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-developing-web-applications)
+* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#using-boot-devtools)
+* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-jpa-and-spring-data)
+* [JDBC API](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-sql)
+
+### Guides
+The following guides illustrate how to use some features concretely:
+
+* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
+* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
+* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/)
+* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/)
+* [Accessing Relational Data using JDBC with Spring](https://spring.io/guides/gs/relational-data-access/)
+* [Managing Transactions](https://spring.io/guides/gs/managing-transactions/)
+
diff --git a/README.md b/README.md
index 1b83c8f..d7cac33 100644
--- a/README.md
+++ b/README.md
@@ -1,65 +1 @@
-# Seleção Java
-
-Olá, tudo tranquilo? Se você chegou até aqui, significa que tem interesse em uma das nossas vagas, certo? Basicamente, o seu código será analisado por um dos nossos arquitetos e se você se sair bem, é bem provável que faça parte do nosso time. Desejamos que você seja muito bem sucedido na atividade quem vem a seguir.
-
-## Vagas
-
-Estamos em constante ascenção e temos vagas para todos os perfis.
-
-
-## Do que se trata a atividade?
-
-Precisamos que você nos mostre que sabe trabalhar com a stack Spring e Angular. Basicamente a ideia consiste na criação de dois projetos, uma API escrita com spring-boot 2.x e banco h2, além de uma camada Web escrita com Angular 7 usando webpack e maven para empacotar e unir os projetos.
-
-Caso você não manje de Angular, encorajamos que você nos envie a API. Claro, quem enviar a API (backend) + Angular (frontend) estará na frente. Justo não?
-
-### O que será avaliado?
-
-* Todos os requistos devem ser atendidos
-* Uso da stack Spring
-* Uso do padrão arquitetural MVC (no backend e no frontend)
-* Padrões de projeto e SOLID
-* Coesão
-* Baixo acoplamento
-* Polimorfismo
-* Uso dos plugins do maven
-* Uso do webpack
-* Documentação interativa da API
-* Evitar código extremamente verboso
-* Chamadas REST escritas no Visual Code Studio com o plugin RestClient. Iremos fazer chamadas direta a sua API sem o front também. Precisamos das requisições HTTP já montadas para todos os recursos
-
-
-### Requisitos que devem ser implementados
-
-* Baixe o arquivo 2019-1_CA.csv por meio do link http://www.anp.gov.br/arquivos/dadosabertos/2019-1_CA.csv e crie uma API REST seguindo os tópicos especificados a seguir
-* Implemente uma documentação interativa. O acesso a essa URI não requer autenticação
-* Implementar recurso para CRUD de usuários
-* Implementar recurso para CRUD de histórico de preço de combustÃvel
-* Implementar recurso para importação de csv
-* Implementar recurso que retorne a média de preço de combustÃvel com base no nome do municÃpio
-* Implementar recurso que retorne todas as informações importadas por sigla da região
-* Implementar recurso que retorne os dados agrupados por distribuidora
-* Implementar recurso que retorne os dados agrupados pela data da coleta
-* Implementar recurso que retorne o valor médio do valor da compra e do valor da venda por municÃpio
-* Implementar recurso que retorne o valor médio do valor da compra e do valor da venda por bandeira
-* OBS: Você deve deduzir quais são as entidades do domÃnio necessárias para completar a atividade, tal como os relacionamentos, etc
-
-### Não entregue a atividade sem isso
-
-* Documentação interativa da API com o Swagger, ou
-* Crie as chamadas para a API em uma Collection do Postman e exporte para que possamos realizar as chamadas através dela.
-
-### Uma vez feito, como entrego o projeto?
-
-* Crie um fork dessa avaliação
-* Desenvolva
-* Faça o push
-* Envie e-mail sinalizando a entrega para o analista técnico que está te apoiando durante o desenvolvimento
-* Você possui 4 dias para entregar a atividade.
-
-
-
-
-
-
-
+Importador csv
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..a16b543
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..72cb833
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,75 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.3.2.RELEASE
+
+
+ com.arquivo
+ import-csv
+ 0.0.1-SNAPSHOT
+ import-csv
+ Demo project for Spring Boot
+
+
+ 11
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ com.opencsv
+ opencsv
+ 5.2
+
+
+
+ com.h2database
+ h2
+ 1.4.193
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/src/main/java/com/arquivo/importcsv/ImportCsvApplication.java b/src/main/java/com/arquivo/importcsv/ImportCsvApplication.java
new file mode 100644
index 0000000..1f936a4
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/ImportCsvApplication.java
@@ -0,0 +1,12 @@
+package com.arquivo.importcsv;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ImportCsvApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ImportCsvApplication.class, args);
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/controllers/CsvController.java b/src/main/java/com/arquivo/importcsv/controllers/CsvController.java
new file mode 100644
index 0000000..10c2adb
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/controllers/CsvController.java
@@ -0,0 +1,23 @@
+package com.arquivo.importcsv.controllers;
+import com.arquivo.importcsv.services.CsvService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.text.ParseException;
+
+@RestController
+@RequestMapping("/csv")
+public class CsvController {
+
+ @Autowired
+ public CsvService csvService;
+
+ @PostMapping
+ public void upload(@RequestParam MultipartFile arquivo) throws IOException, ParseException {
+ this.csvService.uploadCsv(arquivo);
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/controllers/HistoricoController.java b/src/main/java/com/arquivo/importcsv/controllers/HistoricoController.java
new file mode 100644
index 0000000..7157af3
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/controllers/HistoricoController.java
@@ -0,0 +1,62 @@
+package com.arquivo.importcsv.controllers;
+
+
+import com.arquivo.importcsv.dto.ValorCompraVendaDTO;
+import com.arquivo.importcsv.models.HistoricoPrecoCombustivel;
+import com.arquivo.importcsv.services.HistoricoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@CrossOrigin(origins = "*")
+@RestController
+@RequestMapping("/historico")
+public class HistoricoController {
+ @Autowired
+ private HistoricoService historicoService;
+
+ @GetMapping("/regiao/{regiao}")
+ public ResponseEntity> listaHistoricoPorRegiao(@PathVariable String regiao) {
+ List historicos = this.historicoService
+ .findHistoricoPrecoCombustivelsByRegiao(regiao.toUpperCase());
+
+ return ResponseEntity.ok().body(historicos);
+ }
+
+ @GetMapping("/uf/{uf}")
+ public ResponseEntity> listaHistoricoPorUf(@PathVariable String uf) {
+ List historicos = this.historicoService.findByUf(uf.toUpperCase());
+
+ return ResponseEntity.ok().body(historicos);
+ }
+
+ @GetMapping("/valor-venda/{cidade}")
+ public ResponseEntity getMediaValorVendaPorMunicipio(@PathVariable String cidade) {
+ float valorVenda = this.historicoService.getMediaValorVendaPorMunicipio(cidade.toUpperCase());
+
+ return ResponseEntity.ok().body(valorVenda);
+ }
+
+ @GetMapping("/media-compra-venda/municipio/{cidade}")
+ public ResponseEntity getMediaCompraVendaPorMunicipio(@PathVariable String cidade) {
+ ValorCompraVendaDTO valorCompraVendaDTO = this.historicoService
+ .getPrecoMediaCompraVendaPorMunicipio(cidade.toUpperCase());
+
+ return ResponseEntity.ok(valorCompraVendaDTO);
+ }
+
+ @GetMapping("/media-compra-venda/bandeira/{bandeira}")
+ public ResponseEntity getMediaCompraVendaPorBandeira(@PathVariable String bandeira) {
+ ValorCompraVendaDTO valorCompraVendaDTO = this.historicoService
+ .getPrecoMediaCompraVendaPorBandeira(bandeira.toUpperCase());
+
+ return ResponseEntity.ok(valorCompraVendaDTO);
+ }
+
+ @GetMapping("/agrupa/data-coleta")
+ public ResponseEntity> listaAgrupadoDataColeta() {
+ return ResponseEntity.ok(this.historicoService.agrupaPorDataColeta());
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/controllers/UsuarioController.java b/src/main/java/com/arquivo/importcsv/controllers/UsuarioController.java
new file mode 100644
index 0000000..600ef86
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/controllers/UsuarioController.java
@@ -0,0 +1,42 @@
+package com.arquivo.importcsv.controllers;
+
+import com.arquivo.importcsv.models.Usuario;
+import com.arquivo.importcsv.services.UsuarioService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/usuario")
+public class UsuarioController {
+
+ @Autowired
+ private UsuarioService usuarioService;
+
+ @GetMapping
+ public ResponseEntity> index () {
+ return ResponseEntity.ok(usuarioService.findAll());
+ }
+
+ @PostMapping
+ public ResponseEntity create (@RequestBody Usuario usuario) {
+ usuarioService.create(usuario);
+
+ return new ResponseEntity("Created", HttpStatus.CREATED);
+ }
+
+ @DeleteMapping("/{id}")
+ public ResponseEntity delete(@PathVariable Long id) {
+ usuarioService.delete(id);
+ return new ResponseEntity("deletado", HttpStatus.OK);
+ }
+
+ @PutMapping("/{id}")
+ public ResponseEntity delete(@PathVariable Long id, @RequestBody Usuario usuario) {
+ usuarioService.update(id, usuario);
+ return new ResponseEntity("atualizado", HttpStatus.OK);
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/dto/FileDto.java b/src/main/java/com/arquivo/importcsv/dto/FileDto.java
new file mode 100644
index 0000000..ae1055e
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/dto/FileDto.java
@@ -0,0 +1,169 @@
+package com.arquivo.importcsv.dto;
+
+import com.opencsv.bean.CsvBindByPosition;
+
+import javax.xml.crypto.Data;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class FileDto {
+ @CsvBindByPosition(position = 0)
+ private String regiao;
+
+ @CsvBindByPosition(position = 1)
+ private String uf;
+
+ @CsvBindByPosition(position = 2)
+ private String cidade;
+
+ @CsvBindByPosition(position = 3)
+ private String revenda;
+
+ @CsvBindByPosition(position = 4)
+ private String cnpjRevenda;
+
+ @CsvBindByPosition(position = 5)
+ private String produto;
+
+ @CsvBindByPosition(position = 6)
+ private String dataColeta;
+
+ @CsvBindByPosition(position = 7)
+ private String valorVenda;
+
+ @CsvBindByPosition(position = 8)
+ private String valorCompra;
+
+ @CsvBindByPosition(position = 9)
+ private String unidaMedida;
+
+ @CsvBindByPosition(position = 10)
+ private String bandeira;
+
+ public void setRegiao(String regiao) {
+ this.regiao = regiao;
+ }
+
+ public void setUf(String uf) {
+ this.uf = uf;
+ }
+
+ public void setCidade(String cidade) {
+ this.cidade = cidade;
+ }
+
+ public void setRevenda(String revenda) {
+ this.revenda = revenda;
+ }
+
+ public void setCnpjRevenda(String cnpjRevenda) {
+ this.cnpjRevenda = cnpjRevenda;
+ }
+
+ public void setProduto(String produto) {
+ this.produto = produto.replace("\0", "").trim();
+ }
+
+ public void setDataColeta(String dataColeta) {
+ this.dataColeta = dataColeta.replace("\0", "").trim();
+ }
+
+ public void setValorVenda(String valorVenda) {
+ this.valorVenda = valorVenda.replace("\0", "").trim();
+ }
+
+ public void setValorCompra(String valorCompra) {
+ this.valorCompra = valorCompra.replace("\0", "").trim();
+ }
+
+ public void setUnidaMedida(String unidaMedida) {
+ this.unidaMedida = unidaMedida.replace("\0", "").trim();
+ }
+
+ public void setBandeira(String bandeira) {
+ this.bandeira = bandeira.replace("\0", "").trim();
+ }
+
+ public String getRegiao() {
+ if (regiao == null) {
+ return "";
+ }
+ return regiao.replace("\0", "").trim();
+ }
+
+ public String getUf() {
+ if (uf == null) {
+ return "";
+ }
+ return uf.replace("\0", "").trim();
+ }
+
+ public String getCidade() {
+ if (cidade == null) {
+ return "";
+ }
+ return cidade.replace("\0", "").trim();
+ }
+
+ public String getRevenda() {
+ if (revenda == null) {
+ return "";
+ }
+
+ return revenda.replace("\0", "").trim();
+ }
+
+ public String getCnpjRevenda() {
+ if (cnpjRevenda == null) {
+ return "";
+ }
+ return cnpjRevenda.replace("\0", "").trim();
+ }
+
+ public String getProduto() {
+ if (produto == null) {
+ return "";
+ }
+ return produto.replace("\0", "").trim();
+ }
+
+ public Date getDataColeta() throws ParseException {
+ SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy");
+
+ if (dataColeta == null) {
+ return null;
+ }
+ String stringData = dataColeta.replace("\0", "").trim().replace(",", "").replace("\n", "");
+ Date data = formato.parse(stringData);
+ return data;
+ }
+
+ public float getValorVenda() {
+ if (valorVenda == null || valorCompra.equals("")) {
+ return 0;
+ }
+ return Float.parseFloat(valorVenda.replace("\0", "").trim().replace(",", "").replace("\n", ""));
+ }
+
+ public float getValorCompra() {
+ if (valorCompra == null || valorCompra.equals("")) {
+ return 0;
+ }
+ return Float.parseFloat(valorCompra.replace("\0", "").trim().replace(",", "").replace("\n", ""));
+ }
+
+ public String getUnidaMedida() {
+ if (unidaMedida == null) {
+ return "";
+ }
+ return unidaMedida.replace("\0", "").trim();
+ }
+
+ public String getBandeira() {
+ if (bandeira == null) {
+ return "";
+ }
+ return bandeira.replace("\0", "").trim();
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/dto/HistoricoDTO.java b/src/main/java/com/arquivo/importcsv/dto/HistoricoDTO.java
new file mode 100644
index 0000000..83686ed
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/dto/HistoricoDTO.java
@@ -0,0 +1,90 @@
+package com.arquivo.importcsv.dto;
+
+import com.arquivo.importcsv.models.HistoricoPrecoCombustivel;
+
+import java.util.Date;
+
+public class HistoricoDTO {
+ private String regiao;
+ private String uf;
+ private String cidade;
+ private String revenda;
+ private String cnpjRevenda;
+ private String produto;
+ private Date dataColeta;
+ private float valorVenda;
+ private float valorCompra;
+ private String unidaMedida;
+ private String bandeira;
+
+ public HistoricoDTO setRegiao(String regiao) {
+ this.regiao = regiao;
+ return this;
+ }
+
+ public HistoricoDTO setUf(String uf) {
+ this.uf = uf;
+ return this;
+ }
+
+ public HistoricoDTO setCidade(String cidade) {
+ this.cidade = cidade;
+ return this;
+ }
+
+ public HistoricoDTO setRevenda(String revenda) {
+ this.revenda = revenda;
+ return this;
+ }
+
+ public HistoricoDTO setCnpjRevenda(String cnpjRevenda) {
+ this.cnpjRevenda = cnpjRevenda;
+ return this;
+ }
+
+ public HistoricoDTO setProduto(String produto) {
+ this.produto = produto;
+ return this;
+ }
+
+ public HistoricoDTO setDataColeta(Date dataColeta) {
+ this.dataColeta = dataColeta;
+ return this;
+ }
+
+ public HistoricoDTO setValorVenda(float valorVenda) {
+ this.valorVenda = valorVenda;
+ return this;
+ }
+
+ public HistoricoDTO setValorCompra(float valorCompra) {
+ this.valorCompra = valorCompra;
+ return this;
+ }
+
+ public HistoricoDTO setUnidaMedida(String unidaMedida) {
+ this.unidaMedida = unidaMedida;
+ return this;
+ }
+
+ public HistoricoDTO setBandeira(String bandeira) {
+ this.bandeira = bandeira;
+ return this;
+ }
+
+ public HistoricoPrecoCombustivel transformaParaObjeto() {
+ return new HistoricoPrecoCombustivel(
+ regiao,
+ uf,
+ cidade,
+ revenda,
+ cnpjRevenda,
+ produto,
+ dataColeta,
+ valorVenda,
+ valorCompra,
+ unidaMedida,
+ bandeira
+ );
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/dto/ValorCompraVendaDTO.java b/src/main/java/com/arquivo/importcsv/dto/ValorCompraVendaDTO.java
new file mode 100644
index 0000000..882e79a
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/dto/ValorCompraVendaDTO.java
@@ -0,0 +1,22 @@
+package com.arquivo.importcsv.dto;
+
+public class ValorCompraVendaDTO {
+ private Double valorCompra;
+ private Double valorVenda;
+
+ public Double getValorCompra() {
+ return valorCompra;
+ }
+
+ public Double getValorVenda() {
+ return valorVenda;
+ }
+
+ public void setValorCompra(double valorCompra) {
+ this.valorCompra = valorCompra;
+ }
+
+ public void setValorVenda(double valorVenda) {
+ this.valorVenda = valorVenda;
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/models/HistoricoPrecoCombustivel.java b/src/main/java/com/arquivo/importcsv/models/HistoricoPrecoCombustivel.java
new file mode 100644
index 0000000..a6352b7
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/models/HistoricoPrecoCombustivel.java
@@ -0,0 +1,57 @@
+package com.arquivo.importcsv.models;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Entity(name = "TB_HISTORICO")
+public class HistoricoPrecoCombustivel {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private long id;
+ private String regiao;
+ private String uf;
+ private String cidade;
+ private String revenda;
+ private String cnpjRevenda;
+ private String produto;
+ private Date dataColeta;
+ private float valorVenda;
+ private float valorCompra;
+ private String unidaMedida;
+ private String bandeira;
+
+ public HistoricoPrecoCombustivel() {
+
+ }
+
+ public HistoricoPrecoCombustivel(
+ String regiao,
+ String uf,
+ String cidade,
+ String revenda,
+ String cnpjRevenda,
+ String produto,
+ Date dataColeta,
+ float valorVenda,
+ float valorCompra,
+ String unidadeMedida,
+ String bandeira
+ ) {
+ this.regiao = regiao;
+ this.uf = uf;
+ this.cidade = cidade;
+ this.revenda = revenda;
+ this.cnpjRevenda = cnpjRevenda;
+ this.produto = produto;
+ this.dataColeta = dataColeta;
+ this.valorVenda = valorVenda;
+ this.valorCompra = valorCompra;
+ this.unidaMedida = unidadeMedida;
+ this.bandeira = bandeira;
+ }
+
+}
diff --git a/src/main/java/com/arquivo/importcsv/models/Usuario.java b/src/main/java/com/arquivo/importcsv/models/Usuario.java
new file mode 100644
index 0000000..0e37d9a
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/models/Usuario.java
@@ -0,0 +1,51 @@
+package com.arquivo.importcsv.models;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Usuario {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ private String nome;
+ private String email;
+ private String telefone;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getNome() {
+ return nome;
+ }
+
+ public void setNome(String nome) {
+ this.nome = nome;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getTelefone() {
+ return telefone;
+ }
+
+ public void setTelefone(String telefone) {
+ this.telefone = telefone;
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/repositorys/HistoricoRepository.java b/src/main/java/com/arquivo/importcsv/repositorys/HistoricoRepository.java
new file mode 100644
index 0000000..2859b7b
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/repositorys/HistoricoRepository.java
@@ -0,0 +1,32 @@
+package com.arquivo.importcsv.repositorys;
+
+import com.arquivo.importcsv.dto.ValorCompraVendaDTO;
+import com.arquivo.importcsv.models.HistoricoPrecoCombustivel;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface HistoricoRepository extends JpaRepository {
+ @Query(value = "select h from TB_HISTORICO h where h.regiao = ?1")
+ List findByRegiao(String regiao);
+
+ @Query(value = "select h from TB_HISTORICO h where h.uf = ?1")
+ List findByUf(String regiao);
+
+ @Query("select avg(H.valorVenda) from TB_HISTORICO H where H.cidade = ?1")
+ float getMediaValorVendaPorMunicipio(String cidade);
+
+ @Query(value = "select avg(h.valorCompra) as valorCompra, avg(h.valorVenda) as valorVenda from TB_HISTORICO h where h.cidade = ?1")
+ Object[] getPrecoMediaCompraVendaPorMunicipio(String cidade);
+
+
+ @Query(value = "select avg(h.valorCompra) as valorCompra, avg(h.valorVenda) as valorVenda from TB_HISTORICO h where h.bandeira = ?1")
+ Object[] getPrecoMediaCompraVendaPorBandeira(String bandeira);
+
+ @Query("select h from TB_HISTORICO h order by h.dataColeta")
+ List agrupaPorDataColeta();
+}
diff --git a/src/main/java/com/arquivo/importcsv/repositorys/UsuarioRepository.java b/src/main/java/com/arquivo/importcsv/repositorys/UsuarioRepository.java
new file mode 100644
index 0000000..25a1fb4
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/repositorys/UsuarioRepository.java
@@ -0,0 +1,7 @@
+package com.arquivo.importcsv.repositorys;
+
+import com.arquivo.importcsv.models.Usuario;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UsuarioRepository extends JpaRepository {
+}
diff --git a/src/main/java/com/arquivo/importcsv/services/CsvService.java b/src/main/java/com/arquivo/importcsv/services/CsvService.java
new file mode 100644
index 0000000..0ab7ee1
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/services/CsvService.java
@@ -0,0 +1,40 @@
+package com.arquivo.importcsv.services;
+
+import com.arquivo.importcsv.dto.FileDto;
+import com.opencsv.bean.CsvToBean;
+import com.opencsv.bean.CsvToBeanBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.text.ParseException;
+import java.util.List;
+
+@Service
+public class CsvService {
+
+ @Autowired
+ private HistoricoService historicoService;
+
+ public void uploadCsv(MultipartFile file) throws IOException, ParseException {
+ Reader reader = new InputStreamReader(file.getInputStream());
+
+ CsvToBean fileDtoCsvToBean = new CsvToBeanBuilder(reader)
+ .withSeparator('\t')
+ .withType(FileDto.class)
+ .withSkipLines(1)
+ .withIgnoreEmptyLine(true)
+ .build();
+
+ List linhas = fileDtoCsvToBean.parse();
+ this.removeObjetosvazios(linhas);
+ this.historicoService.build(linhas);
+ }
+
+ private void removeObjetosvazios(List linhasCsv) {
+ linhasCsv.removeIf(linha -> linha.getProduto().equals(""));
+ }
+}
diff --git a/src/main/java/com/arquivo/importcsv/services/HistoricoService.java b/src/main/java/com/arquivo/importcsv/services/HistoricoService.java
new file mode 100644
index 0000000..4a108bd
--- /dev/null
+++ b/src/main/java/com/arquivo/importcsv/services/HistoricoService.java
@@ -0,0 +1,96 @@
+package com.arquivo.importcsv.services;
+
+import com.arquivo.importcsv.dto.FileDto;
+import com.arquivo.importcsv.dto.HistoricoDTO;
+import com.arquivo.importcsv.dto.ValorCompraVendaDTO;
+import com.arquivo.importcsv.models.HistoricoPrecoCombustivel;
+import com.arquivo.importcsv.repositorys.HistoricoRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class HistoricoService {
+ @Autowired
+ private HistoricoRepository historicoRepository;
+
+ @Transactional
+ public void build(List linhasCsv) throws ParseException {
+ for (FileDto linha : linhasCsv) {
+ this.montaHistorico(linha);
+ }
+ }
+
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
+ public void montaHistorico(FileDto linha) throws ParseException {
+ HistoricoDTO historicoDTO = new HistoricoDTO();
+ historicoDTO
+ .setRegiao(linha.getRegiao())
+ .setUf(linha.getUf())
+ .setCidade(linha.getCidade())
+ .setRevenda(linha.getRevenda())
+ .setCnpjRevenda(linha.getCnpjRevenda())
+ .setProduto(linha.getProduto())
+ .setDataColeta(linha.getDataColeta())
+ .setValorVenda(linha.getValorVenda())
+ .setValorCompra(linha.getValorCompra())
+ .setUnidaMedida(linha.getUnidaMedida())
+ .setBandeira(linha.getBandeira());
+
+ HistoricoPrecoCombustivel historico = historicoDTO.transformaParaObjeto();
+ historicoRepository.save(historico);
+ }
+
+ public List listaHistoricos () {
+ return this.historicoRepository.findAll();
+ }
+
+ public List findHistoricoPrecoCombustivelsByRegiao(String regiao) {
+ return this.historicoRepository.findByRegiao(regiao);
+ }
+
+ public List findByUf(String uf) {
+ return this.historicoRepository.findByUf(uf);
+ }
+
+ public float getMediaValorVendaPorMunicipio(String cidade) {
+ return this.historicoRepository.getMediaValorVendaPorMunicipio(cidade);
+ }
+
+ public ValorCompraVendaDTO getPrecoMediaCompraVendaPorMunicipio(String cidade) {
+
+ List