From 9ee09e9fdd29467c8ec3a8fd8e1a1db1ace7e531 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 00:51:14 +0900 Subject: [PATCH 01/26] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20bu?= =?UTF-8?q?ild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 31 +++ .../hackathon/TecheerApplication.class | Bin 0 -> 752 bytes .../hackathon/TecheerApplicationTests.class | Bin 0 -> 550 bytes ...eer.hackathon.TecheerApplicationTests.html | 134 ++++++++++ build/reports/tests/test/css/base-style.css | 179 +++++++++++++ build/reports/tests/test/css/style.css | 84 ++++++ build/reports/tests/test/index.html | 133 ++++++++++ build/reports/tests/test/js/report.js | 194 ++++++++++++++ .../test/packages/com.techeer.hackathon.html | 103 ++++++++ build/resources/main/application.yml | 20 ++ ...heer.hackathon.TecheerApplicationTests.xml | 36 +++ build/test-results/test/binary/output.bin | Bin 0 -> 9902 bytes build/test-results/test/binary/output.bin.idx | Bin 0 -> 36 bytes build/test-results/test/binary/results.bin | Bin 0 -> 125 bytes .../compileJava/previous-compilation-data.bin | Bin 0 -> 21182 bytes .../previous-compilation-data.bin | Bin 0 -> 19874 bytes gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 ++++++++++++++++++ gradlew.bat | 91 +++++++ settings.gradle | 1 + .../techeer/hackathon/TecheerApplication.java | 13 + src/main/resources/application.yml | 20 ++ .../hackathon/TecheerApplicationTests.java | 13 + 24 files changed, 1297 insertions(+) create mode 100644 build.gradle create mode 100644 build/classes/java/main/com/techeer/hackathon/TecheerApplication.class create mode 100644 build/classes/java/test/com/techeer/hackathon/TecheerApplicationTests.class create mode 100644 build/reports/tests/test/classes/com.techeer.hackathon.TecheerApplicationTests.html create mode 100644 build/reports/tests/test/css/base-style.css create mode 100644 build/reports/tests/test/css/style.css create mode 100644 build/reports/tests/test/index.html create mode 100644 build/reports/tests/test/js/report.js create mode 100644 build/reports/tests/test/packages/com.techeer.hackathon.html create mode 100644 build/resources/main/application.yml create mode 100644 build/test-results/test/TEST-com.techeer.hackathon.TecheerApplicationTests.xml create mode 100644 build/test-results/test/binary/output.bin create mode 100644 build/test-results/test/binary/output.bin.idx create mode 100644 build/test-results/test/binary/results.bin create mode 100644 build/tmp/compileJava/previous-compilation-data.bin create mode 100644 build/tmp/compileTestJava/previous-compilation-data.bin create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/techeer/hackathon/TecheerApplication.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/techeer/hackathon/TecheerApplicationTests.java diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..ae207bac --- /dev/null +++ b/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.9' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/build/classes/java/main/com/techeer/hackathon/TecheerApplication.class b/build/classes/java/main/com/techeer/hackathon/TecheerApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..1424f418296d7e605a71050e2ac7a9ea41b22363 GIT binary patch literal 752 zcma)4%Wl&^6g`tiotQvN(g$r}!7j<7vx7xYr4p$t^AM@hMOR~Y>P%zLMB_2=TdY7V z_y9f%amR_2NDUH}d`I_n&OLYL_n)7?0KCSF5DgpzI1F)wX912GcHSth+&M$NKbSH! z#^zQs>_$q<_hlYSdnMwGBHhR&BAW`UyuS)I+)Nb=!zeL1cQTntY57bfbKz!2^Q&d# zVzJ0nBAhaML=3r5n&Gg26Wxo?f@eafeB!Lq>8P4O*px7PTha`B?<67LeiT;Z(n(8& z;lz|Sk(bI(dGwI-%(E~Ye=4<8xtyv(k$?-WjjKi?i1WzUloty>!<|R|V(gs9#yBoY zXA-0DR9afeCsoN?N^ENCpotxZ{{Jo^z)1(EcusQG8~704%f!(x|2fK%e1n+o%$Bsu zxWBQ6As&&}CjT*k_~us?7|`n0hCfihUiXKT0d)k_v&LxQ33e&IM}L!% QQ^lYgYoqR} zJW*~el8lgkY^BI1!s$9+flW+x$$-bw<{Xtwm2x~4av?CahL4xXuqZMu1!`-?s>Jew zK_sm~^@6b#Qxe#Fs0`{{O?0VAeQ1nD-%qtcY~75{E83E5p^-+2LX&ujq|_eS%1L#r z>m>(&Ogx>7C&A#%OO=JwX7=bruAZ%1@WfiA + + + + +Test results - TecheerApplicationTests + + + + + +
+

TecheerApplicationTests

+
+all > +com.techeer.hackathon > TecheerApplicationTests
+
+ + + + + +
+
+ + + + + + + +
+
+
1
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.166s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Tests

+ + + + + + + + + + + + + +
TestDurationResult
contextLoads()0.166spassed
+
+
+

Standard output

+ +
00:40:57.356 [Test worker] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating CacheAwareContextLoaderDelegate from class [org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate]
+00:40:57.361 [Test worker] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating BootstrapContext using constructor [public org.springframework.test.context.support.DefaultBootstrapContext(java.lang.Class,org.springframework.test.context.CacheAwareContextLoaderDelegate)]
+00:40:57.384 [Test worker] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating TestContextBootstrapper for test class [com.techeer.hackathon.TecheerApplicationTests] from class [org.springframework.boot.test.context.SpringBootTestContextBootstrapper]
+00:40:57.390 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.techeer.hackathon.TecheerApplicationTests], using SpringBootContextLoader
+00:40:57.392 [Test worker] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.techeer.hackathon.TecheerApplicationTests]: class path resource [com/techeer/hackathon/TecheerApplicationTests-context.xml] does not exist
+00:40:57.392 [Test worker] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.techeer.hackathon.TecheerApplicationTests]: class path resource [com/techeer/hackathon/TecheerApplicationTestsContext.groovy] does not exist
+00:40:57.393 [Test worker] INFO org.springframework.test.context.support.AbstractContextLoader - Could not detect default resource locations for test class [com.techeer.hackathon.TecheerApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}.
+00:40:57.393 [Test worker] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils - Could not detect default configuration classes for test class [com.techeer.hackathon.TecheerApplicationTests]: TecheerApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration.
+00:40:57.425 [Test worker] DEBUG org.springframework.test.context.support.ActiveProfilesUtils - Could not find an 'annotation declaring class' for annotation type [org.springframework.test.context.ActiveProfiles] and class [com.techeer.hackathon.TecheerApplicationTests]
+00:40:57.453 [Test worker] DEBUG org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider - Identified candidate component class: file [/Users/hangyeol/Good-Night-Hackathon-SpringBoot/build/classes/java/main/com/techeer/hackathon/TecheerApplication.class]
+00:40:57.454 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Found @SpringBootConfiguration com.techeer.hackathon.TecheerApplication for test class com.techeer.hackathon.TecheerApplicationTests
+00:40:57.499 [Test worker] DEBUG org.springframework.boot.test.context.SpringBootTestContextBootstrapper - @TestExecutionListeners is not present for class [com.techeer.hackathon.TecheerApplicationTests]: using defaults.
+00:40:57.499 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.event.ApplicationEventsTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener]
+00:40:57.504 [Test worker] DEBUG org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Skipping candidate TestExecutionListener [org.springframework.test.context.transaction.TransactionalTestExecutionListener] due to a missing dependency. Specify custom listener classes or make the default listener classes and their required dependencies available. Offending class: [org/springframework/transaction/interceptor/TransactionAttributeSource]
+00:40:57.504 [Test worker] DEBUG org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Skipping candidate TestExecutionListener [org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener] due to a missing dependency. Specify custom listener classes or make the default listener classes and their required dependencies available. Offending class: [org/springframework/transaction/interceptor/TransactionAttribute]
+00:40:57.505 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@70d2e40b, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@120f38e6, org.springframework.test.context.event.ApplicationEventsTestExecutionListener@7a0e1b5e, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@702ed190, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@173b9122, org.springframework.test.context.support.DirtiesContextTestExecutionListener@7c18432b, org.springframework.test.context.event.EventPublishingTestExecutionListener@7646731d, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@70e29e14, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@3b1bb3ab, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@5a4bef8, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@40bffbca, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@2449cff7, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@42a9a63e]
+00:40:57.507 [Test worker] DEBUG org.springframework.test.context.support.AbstractDirtiesContextTestExecutionListener - Before test class: context [DefaultTestContext@596df867 testClass = TecheerApplicationTests, testInstance = [null], testMethod = [null], testException = [null], mergedContextConfiguration = [WebMergedContextConfiguration@c1fca1e testClass = TecheerApplicationTests, locations = '{}', classes = '{class com.techeer.hackathon.TecheerApplication}', contextInitializerClasses = '[]', activeProfiles = '{}', propertySourceLocations = '{}', propertySourceProperties = '{org.springframework.boot.test.context.SpringBootTestContextBootstrapper=true}', contextCustomizers = set[org.springframework.boot.test.autoconfigure.actuate.metrics.MetricsExportContextCustomizerFactory$DisableMetricExportContextCustomizer@765f05af, org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCustomizer@0, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverContextCustomizerFactory$Customizer@3543df7d, org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizer@1e7aa82b, org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory$DuplicateJsonObjectContextCustomizer@1c6804cd, org.springframework.boot.test.mock.mockito.MockitoContextCustomizer@0, org.springframework.boot.test.web.client.TestRestTemplateContextCustomizer@488eb7f2, org.springframework.boot.test.context.SpringBootTestArgs@1, org.springframework.boot.test.context.SpringBootTestWebEnvironment@41f69e84], resourceBasePath = 'src/main/webapp', contextLoader = 'org.springframework.boot.test.context.SpringBootContextLoader', parent = [null]], attributes = map['org.springframework.test.context.web.ServletTestExecutionListener.activateListener' -> true]], class annotated with @DirtiesContext [false] with mode [null].
+
+  .   ____          _            __ _ _
+ /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
+( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
+ \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
+  '  |____| .__|_| |_|_| |_\__, | / / / /
+ =========|_|==============|___/=/_/_/_/
+ :: Spring Boot ::                (v2.7.9)
+
+2023-02-26 00:40:57.744  INFO 15893 --- [    Test worker] c.t.hackathon.TecheerApplicationTests    : Starting TecheerApplicationTests using Java 11.0.18 on baeghangyeol-ui-MacBookPro.local with PID 15893 (started by hangyeol in /Users/hangyeol/Good-Night-Hackathon-SpringBoot)
+2023-02-26 00:40:57.745  INFO 15893 --- [    Test worker] c.t.hackathon.TecheerApplicationTests    : No active profile set, falling back to 1 default profile: "default"
+2023-02-26 00:40:58.356  INFO 15893 --- [    Test worker] c.t.hackathon.TecheerApplicationTests    : Started TecheerApplicationTests in 0.832 seconds (JVM running for 1.379)
+
+ +
+
+ +
+ + diff --git a/build/reports/tests/test/css/base-style.css b/build/reports/tests/test/css/base-style.css new file mode 100644 index 00000000..4afa73e3 --- /dev/null +++ b/build/reports/tests/test/css/base-style.css @@ -0,0 +1,179 @@ + +body { + margin: 0; + padding: 0; + font-family: sans-serif; + font-size: 12pt; +} + +body, a, a:visited { + color: #303030; +} + +#content { + padding-left: 50px; + padding-right: 50px; + padding-top: 30px; + padding-bottom: 30px; +} + +#content h1 { + font-size: 160%; + margin-bottom: 10px; +} + +#footer { + margin-top: 100px; + font-size: 80%; + white-space: nowrap; +} + +#footer, #footer a { + color: #a0a0a0; +} + +#line-wrapping-toggle { + vertical-align: middle; +} + +#label-for-line-wrapping-toggle { + vertical-align: middle; +} + +ul { + margin-left: 0; +} + +h1, h2, h3 { + white-space: nowrap; +} + +h2 { + font-size: 120%; +} + +ul.tabLinks { + padding-left: 0; + padding-top: 10px; + padding-bottom: 10px; + overflow: auto; + min-width: 800px; + width: auto !important; + width: 800px; +} + +ul.tabLinks li { + float: left; + height: 100%; + list-style: none; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + padding-bottom: 5px; + margin-bottom: 0; + -moz-border-radius: 7px; + border-radius: 7px; + margin-right: 25px; + border: solid 1px #d4d4d4; + background-color: #f0f0f0; +} + +ul.tabLinks li:hover { + background-color: #fafafa; +} + +ul.tabLinks li.selected { + background-color: #c5f0f5; + border-color: #c5f0f5; +} + +ul.tabLinks a { + font-size: 120%; + display: block; + outline: none; + text-decoration: none; + margin: 0; + padding: 0; +} + +ul.tabLinks li h2 { + margin: 0; + padding: 0; +} + +div.tab { +} + +div.selected { + display: block; +} + +div.deselected { + display: none; +} + +div.tab table { + min-width: 350px; + width: auto !important; + width: 350px; + border-collapse: collapse; +} + +div.tab th, div.tab table { + border-bottom: solid #d0d0d0 1px; +} + +div.tab th { + text-align: left; + white-space: nowrap; + padding-left: 6em; +} + +div.tab th:first-child { + padding-left: 0; +} + +div.tab td { + white-space: nowrap; + padding-left: 6em; + padding-top: 5px; + padding-bottom: 5px; +} + +div.tab td:first-child { + padding-left: 0; +} + +div.tab td.numeric, div.tab th.numeric { + text-align: right; +} + +span.code { + display: inline-block; + margin-top: 0em; + margin-bottom: 1em; +} + +span.code pre { + font-size: 11pt; + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + padding-right: 10px; + margin: 0; + background-color: #f7f7f7; + border: solid 1px #d0d0d0; + min-width: 700px; + width: auto !important; + width: 700px; +} + +span.wrapped pre { + word-wrap: break-word; + white-space: pre-wrap; + word-break: break-all; +} + +label.hidden { + display: none; +} \ No newline at end of file diff --git a/build/reports/tests/test/css/style.css b/build/reports/tests/test/css/style.css new file mode 100644 index 00000000..3dc4913e --- /dev/null +++ b/build/reports/tests/test/css/style.css @@ -0,0 +1,84 @@ + +#summary { + margin-top: 30px; + margin-bottom: 40px; +} + +#summary table { + border-collapse: collapse; +} + +#summary td { + vertical-align: top; +} + +.breadcrumbs, .breadcrumbs a { + color: #606060; +} + +.infoBox { + width: 110px; + padding-top: 15px; + padding-bottom: 15px; + text-align: center; +} + +.infoBox p { + margin: 0; +} + +.counter, .percent { + font-size: 120%; + font-weight: bold; + margin-bottom: 8px; +} + +#duration { + width: 125px; +} + +#successRate, .summaryGroup { + border: solid 2px #d0d0d0; + -moz-border-radius: 10px; + border-radius: 10px; +} + +#successRate { + width: 140px; + margin-left: 35px; +} + +#successRate .percent { + font-size: 180%; +} + +.success, .success a { + color: #008000; +} + +div.success, #successRate.success { + background-color: #bbd9bb; + border-color: #008000; +} + +.failures, .failures a { + color: #b60808; +} + +.skipped, .skipped a { + color: #c09853; +} + +div.failures, #successRate.failures { + background-color: #ecdada; + border-color: #b60808; +} + +ul.linkList { + padding-left: 0; +} + +ul.linkList li { + list-style: none; + margin-bottom: 5px; +} diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html new file mode 100644 index 00000000..b47feaa0 --- /dev/null +++ b/build/reports/tests/test/index.html @@ -0,0 +1,133 @@ + + + + + +Test results - Test Summary + + + + + +
+

Test Summary

+
+ + + + + +
+
+ + + + + + + +
+
+
1
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.166s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Packages

+ + + + + + + + + + + + + + + + + + + + + +
PackageTestsFailuresIgnoredDurationSuccess rate
+com.techeer.hackathon +1000.166s100%
+
+
+

Classes

+ + + + + + + + + + + + + + + + + + + + + +
ClassTestsFailuresIgnoredDurationSuccess rate
+com.techeer.hackathon.TecheerApplicationTests +1000.166s100%
+
+
+ +
+ + diff --git a/build/reports/tests/test/js/report.js b/build/reports/tests/test/js/report.js new file mode 100644 index 00000000..83bab4a1 --- /dev/null +++ b/build/reports/tests/test/js/report.js @@ -0,0 +1,194 @@ +(function (window, document) { + "use strict"; + + var tabs = {}; + + function changeElementClass(element, classValue) { + if (element.getAttribute("className")) { + element.setAttribute("className", classValue); + } else { + element.setAttribute("class", classValue); + } + } + + function getClassAttribute(element) { + if (element.getAttribute("className")) { + return element.getAttribute("className"); + } else { + return element.getAttribute("class"); + } + } + + function addClass(element, classValue) { + changeElementClass(element, getClassAttribute(element) + " " + classValue); + } + + function removeClass(element, classValue) { + changeElementClass(element, getClassAttribute(element).replace(classValue, "")); + } + + function initTabs() { + var container = document.getElementById("tabs"); + + tabs.tabs = findTabs(container); + tabs.titles = findTitles(tabs.tabs); + tabs.headers = findHeaders(container); + tabs.select = select; + tabs.deselectAll = deselectAll; + tabs.select(0); + + return true; + } + + function getCheckBox() { + return document.getElementById("line-wrapping-toggle"); + } + + function getLabelForCheckBox() { + return document.getElementById("label-for-line-wrapping-toggle"); + } + + function findCodeBlocks() { + var spans = document.getElementById("tabs").getElementsByTagName("span"); + var codeBlocks = []; + for (var i = 0; i < spans.length; ++i) { + if (spans[i].className.indexOf("code") >= 0) { + codeBlocks.push(spans[i]); + } + } + return codeBlocks; + } + + function forAllCodeBlocks(operation) { + var codeBlocks = findCodeBlocks(); + + for (var i = 0; i < codeBlocks.length; ++i) { + operation(codeBlocks[i], "wrapped"); + } + } + + function toggleLineWrapping() { + var checkBox = getCheckBox(); + + if (checkBox.checked) { + forAllCodeBlocks(addClass); + } else { + forAllCodeBlocks(removeClass); + } + } + + function initControls() { + if (findCodeBlocks().length > 0) { + var checkBox = getCheckBox(); + var label = getLabelForCheckBox(); + + checkBox.onclick = toggleLineWrapping; + checkBox.checked = false; + + removeClass(label, "hidden"); + } + } + + function switchTab() { + var id = this.id.substr(1); + + for (var i = 0; i < tabs.tabs.length; i++) { + if (tabs.tabs[i].id === id) { + tabs.select(i); + break; + } + } + + return false; + } + + function select(i) { + this.deselectAll(); + + changeElementClass(this.tabs[i], "tab selected"); + changeElementClass(this.headers[i], "selected"); + + while (this.headers[i].firstChild) { + this.headers[i].removeChild(this.headers[i].firstChild); + } + + var h2 = document.createElement("H2"); + + h2.appendChild(document.createTextNode(this.titles[i])); + this.headers[i].appendChild(h2); + } + + function deselectAll() { + for (var i = 0; i < this.tabs.length; i++) { + changeElementClass(this.tabs[i], "tab deselected"); + changeElementClass(this.headers[i], "deselected"); + + while (this.headers[i].firstChild) { + this.headers[i].removeChild(this.headers[i].firstChild); + } + + var a = document.createElement("A"); + + a.setAttribute("id", "ltab" + i); + a.setAttribute("href", "#tab" + i); + a.onclick = switchTab; + a.appendChild(document.createTextNode(this.titles[i])); + + this.headers[i].appendChild(a); + } + } + + function findTabs(container) { + return findChildElements(container, "DIV", "tab"); + } + + function findHeaders(container) { + var owner = findChildElements(container, "UL", "tabLinks"); + return findChildElements(owner[0], "LI", null); + } + + function findTitles(tabs) { + var titles = []; + + for (var i = 0; i < tabs.length; i++) { + var tab = tabs[i]; + var header = findChildElements(tab, "H2", null)[0]; + + header.parentNode.removeChild(header); + + if (header.innerText) { + titles.push(header.innerText); + } else { + titles.push(header.textContent); + } + } + + return titles; + } + + function findChildElements(container, name, targetClass) { + var elements = []; + var children = container.childNodes; + + for (var i = 0; i < children.length; i++) { + var child = children.item(i); + + if (child.nodeType === 1 && child.nodeName === name) { + if (targetClass && child.className.indexOf(targetClass) < 0) { + continue; + } + + elements.push(child); + } + } + + return elements; + } + + // Entry point. + + window.onload = function() { + initTabs(); + initControls(); + }; +} (window, window.document)); \ No newline at end of file diff --git a/build/reports/tests/test/packages/com.techeer.hackathon.html b/build/reports/tests/test/packages/com.techeer.hackathon.html new file mode 100644 index 00000000..3c7917c0 --- /dev/null +++ b/build/reports/tests/test/packages/com.techeer.hackathon.html @@ -0,0 +1,103 @@ + + + + + +Test results - Package com.techeer.hackathon + + + + + +
+

Package com.techeer.hackathon

+
+all > com.techeer.hackathon
+
+ + + + + +
+
+ + + + + + + +
+
+
1
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.166s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Classes

+ + + + + + + + + + + + + + + + + + + +
ClassTestsFailuresIgnoredDurationSuccess rate
+TecheerApplicationTests +1000.166s100%
+
+
+ +
+ + diff --git a/build/resources/main/application.yml b/build/resources/main/application.yml new file mode 100644 index 00000000..2e76a0cc --- /dev/null +++ b/build/resources/main/application.yml @@ -0,0 +1,20 @@ +spring: + jpa: + database: "mysql" + show-sql: "true" + hibernate: + ddl-auto: "update" + properties: + hibernate: + format_sql: true + generate-ddl: true + + datasource: + driver-class-name: "com.mysql.cj.jdbc.Driver" + url: "jdbc:mysql://localhost:3306/test_db?useSSL=false&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul&characterEncoding=UTF-8&autoReconnect=true&createDatabaseIfNotExist=true" + username: "root" + password: "0000" + + flyway: + enabled: false + baseline-on-migrate: true diff --git a/build/test-results/test/TEST-com.techeer.hackathon.TecheerApplicationTests.xml b/build/test-results/test/TEST-com.techeer.hackathon.TecheerApplicationTests.xml new file mode 100644 index 00000000..85450f08 --- /dev/null +++ b/build/test-results/test/TEST-com.techeer.hackathon.TecheerApplicationTests.xml @@ -0,0 +1,36 @@ + + + + + true]], class annotated with @DirtiesContext [false] with mode [null]. + + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ +( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + :: Spring Boot :: (v2.7.9) + +2023-02-26 00:40:57.744 INFO 15893 --- [ Test worker] c.t.hackathon.TecheerApplicationTests : Starting TecheerApplicationTests using Java 11.0.18 on baeghangyeol-ui-MacBookPro.local with PID 15893 (started by hangyeol in /Users/hangyeol/Good-Night-Hackathon-SpringBoot) +2023-02-26 00:40:57.745 INFO 15893 --- [ Test worker] c.t.hackathon.TecheerApplicationTests : No active profile set, falling back to 1 default profile: "default" +2023-02-26 00:40:58.356 INFO 15893 --- [ Test worker] c.t.hackathon.TecheerApplicationTests : Started TecheerApplicationTests in 0.832 seconds (JVM running for 1.379) +]]> + + diff --git a/build/test-results/test/binary/output.bin b/build/test-results/test/binary/output.bin new file mode 100644 index 0000000000000000000000000000000000000000..609be40d6d9c4b59a85073ebde69e92be7d32b05 GIT binary patch literal 9902 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 literal 0 HcmV?d00001 diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..3be8d9a99bf73ef3d5ae3d6a528b3273382ab794 GIT binary patch literal 19874 zcmeIacT^PF);C-^w5iN##GHGMW6pu7s3Qdd@yoCM>3YDfg6O8#9rZv0>WO+`E;e%0-k6((owd2L59VQEXKSvM$@^k1 z2DavWKgJ6Abt;`j@~r0m9$kgqwM6KR8ZM-Of=AgMqWgd1|VI()V6-kf^XKMy_tQZlZF(i0c;8$i!&U~~0Ekuiu zD&}G>Q>tNy4IPy-Lpx(*M|I3YT(P;*Q3La^H&>V|ZRAp6Xj}%9;3!>Gd|>x2>*-5W zG?5lsjK+;vf_W(HY;A4iN~tjD#mJ+{i9Rpv!hW>vG^y^Zt-Vxl8Cs5d=wOFI4l-*6 zXa(PI1?Fk3P#Rbp$rM6+e6-fh!pyO1O{A^UosQO(NEfX_tC7m^5o<743u8kgsW5+8 z{XGB8{hNxz3*L3L)S9D*)}nPtAB|fNbIauRmNMlAkhy`WVk72iVk5Vb3Z)HeD|Mr+ z<QO7?GdpPjGOK4vl2V>>cHhDhHC zbG0{@?J~yPfeA9jRH-ob1DYSEDLJIm{`9TO7Qg8-WP(hQ88Sx}Xb0+LiFp_(fDWaF z73OMWBbQlYp5~xEB{CPV2ZoeyDLRFSL zV#4uT%XW^EuU6H2WyJf}>n2V#W%n|dHnaE%kBiU~3;AA0x zZ1H!?fwFDgsVaR%$r#-|tM{UP$bLU|$lQiMfO*IiHg<9&nXsc{;gbRLZg!gzo4Y~y zGvm$4;=F_0d2IAJMx}52-iXes%c|=7{^>~fD^(*_bsoF zrEc!lyzcbm=VJn!y>R4>qg6gQ@E9yrRL`(QRfkq>&Kh;{OTfD5ua+cpiuXRSSeq)&^Fcial#nP+st>(`^wOv|?%-tlkCTC>Te_aAbcR=2rs8 zPT-i2ktN7TE;BIhd`C+u^;e&=?UmfV{|k%i{$Eex=oF4ZV5(4UeltmgrZr>Ajr21cJD6*jkJ{)~G&X!8ErtO?t!!e*bvQ8@1b$wg3xK zq389@o{}iP8%bsp*Odg!-j#r(L>wi-%925(3IK0oJ4@g}3eX7fXkre$&-U0cIa%rO zWqQkC<;=z21($G?ila0f>0btJSlJt;!yNFivAHN!sW2v?^=#I(&0F*~p4n?KH81K4 zj;?|@CrE{yi>KNrN2|_Rk>R)R-l)m*uHh&H)GQO;2LQGQdol&Bcl$6n=yLXJyZRq5 z47Sfb{51e$%Uvfua9~(=he)*5tO%a69>I)CrQF=mPAL;ywC4r}HQw&0J-Oocw#t>q z9^>c#+ZA?u; zV$Xp$@Nt@j(2=c+um0|QK5#;G+J@yrro6z>OB}tzQ4Nk(k6&Laiq_H`xF{8VHiRj1VR!R2<*l ze0}MOG=)a)h5XYWaMS=Q*9cFTm|KF{N`-Z=Kb6h7HYYdNH`3gAXHdaMT;mh2_8CWC zL~KaGfkj_M=9-v;e+TUm*nkb%XNj!J)Db~_i`DiYYrZ8bAOULg4wnkfpC%sl9lA8u;Bap${EFYZLj-am zkSl>!xxoOPA;~m%0?YY7so3L%hTD2(W!umttkuYCW*C^7$;eftn@?9!8e zh7lU43AHoCsI$b1aAHLSfzAiw16dqLS3+slMjITUTUcYytcJ{rUF~jS|s^1{cI;o&B+i&5Bu4D$W#V5ERHTF^tfo>A$7J+UP z=nkyG#x_@^1>CHu^zT(TKOnTq2(@xT{WJa$RO4UIg1L4M?r`_eD?QadWjDs6!u^|KzCI$*V^L;L zV4>#L;Cz5Oqh7%i1)W`=oJUoM zHto4?GcUDcI>Q&8>|=_73)H+LjY{UpV6#T-+nv<;e#EH4vzg zKp%m&PhchnHnyKZTMZPppnVn)I@}rFvnf|)_~Yu$wa4eG>=eEb=qmvZy$POzOv}o~ z8nEWe*+o;M*G(8DJKzzj+V30DOrRD5wZfR+L{I>S40HE69i1Yt{8o9)oA?$Px1nbn zfxZKj;O!tr$R*58{?5jv!iG?C(7nmqKb?HBVD_L7NgW*o`T-(`FoN1RzW_0kCqO5W0Jx@AVG3jjWvY&`cN;f5?vn&mtA$ zC^C~2m%dJ4J0NcO5fY7+3cF)YCEPAd+q*-z;MTRp9(no$bd5>KsCg=TA7v)s`p22eL|JC+>h;bmPFwsGRcKor-kt4u6s3|?k$XFS592i z6hUg8Bf&N!ftz*;mR=FR2Ra6(LaQv}m zmk(xI%$q+q>%`^OEwK=8x?Wy$`K&zD-DP%Tt!OUWimM4Tx$(T zbdyB4NVMoSiFq5#{!X%Otih~T8Ja!G(79wwY0EOVM{laWLu%%d`gh4u{rNl+(oVzo zxX>1>mFvI!lDRz2I@-;Z#tT7sGFzFoF{E~mMdFuVBiqP@z|^G&Tql_< zIlXa=+~*dpTTG%764~Dqc_{-MGXg38k)1UBM)88JM;0tt;O4$;SSg9_ljs47%7E*s zL>k~Pqzk3JwZ;7s6()e|61&N-LXl?|E;mfwG{UZ-t?tQ7{q>EO5 zw2xxFJ|6+jrD|z@%OTqBxHBsZ*Q*uF>r^+M(4Ngwl%eh zpI?!v2GqJ1loNPjW&`%OVzhVF82=vY!#Vkfk$X_WYZ5ZAI+$3D)J5nPs*QY0XW74q z8fY-EYvzwD``(b~Es5TdNM*u%FlInvNUIDw3m}7i$FH%BT`@WQz~i<){mQ-SN&PDF z1K60k(oE>uFzaY}^o`YHaxB$m_AF2~km`*j`ba{UdV%0SiEHf)Qz4_c^=a;%Q)Lm| zS|e3XH!jw+{7hPS68*A>Hdv{FwSg&&*`5=##6%_hwf5|M%(tdT^LG*n?QmNp-bx`1GicbfcAI*) z!-s?jqXm%*I!N>b(BdbkFI3q~?F{6`<_6Y%g<-AE|t1+$l&Bqymj`rQI5iSdYQ1v|K~N7kE(G zo|NukO4W-(9V8F`gtxucYx>!zeW_}gJd3=MYVS>{`%s#na9;{L{O>vi=+UP!jn#g> z%bnh~tr2=x4O8)>&=CrvBY$|#RICA*m@CYrf|kpyJ!5C2T?}w2*;}Y}BsYLUM=5}= zKnhaH&d8xCmOZHN)aGW5S;tY$>rK@%l;~axrdDSV$EeOS zizNgp0{?bXS*v~bRJ-GkHk}T9JK#8_ae`WLlG3%yBu-I)$X2otpv7EaWCM@G3vQbS z6vw>Jupf1M&~EX==?G3KWq)OM&we%bejrnt`RA>=-2s{}ghn!$jHY z)-5DAabJW*1clB~kXNPvFP9EpZ?E0GBF0EH)-`VI(ZP|_iYRJSG^HLxX)ZfSWD)#% z3PM{enF10_nQ(kea4(&WS8Lxct1nph%(^O;LU9x_xj>0lBsxQ>z)ns3Ypb)%sK3gW zZ7oUtVRVrKE1Dt9v$nQ9*J|V&aL`}>z+K-V@zk0GN8Tv*wokCYc0f&KbHu$`+sEe49 z-S|>%ThsHoy{}T}8U;vQ3-`{>rGB(5zPe&IoxJzh!0G-OlzJwmo<-@D64}6FncP%n zEXKaV^6^Ks7kqzv>h4)I>w?!I>^ik3in;;J2NaMAFL}Fx}LDv-9v_;_;X^%j@_h3-&DKNnbTVrSi16@%r)j_GPKHgaJ6 z#?0}4ab0Wb?oud^LirR@DF9N8#Kga_({ikh?Br1C1K^!cv>oezV5`qUm)OF-mYP9D z6e^}r35Cqm@4=(S<{-|$ohlnQspWg6-3%WSdb%R5ZfhyEx`Dhes;H?sz^$WDKWE>r zn!)1@>ZT-4v$6g*>H&qyM46V0LbrkXknAB0*@+#HTtSgGx}&4NO2cLMO{c5MUVCe7 zeMF(h6olSSU|C`z*BAgqDqJeGJ)GWM{$p?#zj@LQjm;I5Y6=tSr}(?f6{KgVG6(U+^%FN@ZGO+l>#5{|=! z-?)u8hc!=9MAkCNE9$5vZz#35)QZpeJJGPLWX9$AdmsZ6NEqeAA9q)@&RBnB{)LyP zww%hJT~DD86a;UefZd3VSGVr2oBJvu&cbg-TS^0^)kvv*q?WtkpMWx8u^29OWk1805X9ho%dcFBfp)VAg_Lahp*!~?$$)Kp#8HBwL_j9(lR@1TCWPI&%;GVQ5 z3N=$`Q40`fYhwfD>TO#U#fjs+y%s(WKjW#KtlmnYZxpgW3SPZvg`2MGZq?SsDZ#^g z_#7GE26zBJ4>N7w?NnayE=^?v=GkwD&UXs6gJDuoC#uDNz*;-wFbG->4B3RYFY1WR zTl28xN0Iwa3OUheoHH#Z$wo3;(eF$%e!uc-5)tE#00`pV=bmUMYW2`wp?-R<7)K_gEZ zvckhO=#ZUZXMI*GBsqIbBBv-c^M|Y)Sba0v){92oH1eUr1J!nVAa22n^mBtVo{YcI zZ!MQIvzIT8{Agr&1Ze#gElGt*`}vaQ^9%0e4n3%HeP>CyKdl)+tG|I<6@sr4r^4!P zMvkq1T4CMJ7gTjWN~1s;1<_FT4yG|z$j>Z~(PG>TiykFEzp{Uio3Ba=4t#yF!r1XR zjZV-Ii9$>gv*^{#t=T&sMb(_!)g{O6?nxS*q9KaE3v6GqWmJn@MnHY@=>>Bm2TB7% zXcS5VI)~8!GxnX<9Ft!3Np5|3@48uZSe)Wy#AzBbCMZxQ`OKWbjtcKMq-B*CS~L6% zjn0A~YC(VF>s_}u=w9-&Tdt_2GuP&a(t`}y$)}t{ zX?r4R6h%Y+84a_7ud#*X$3fFe=d#zdqJGLDTjn3uJR2k4hf2ZJ5#zPW&9}65Jim3Q z&AaV94HhXC(#|B2-ZrBb-*n9Bd2`gKEE+;*sjyR4s&aCOcDw3! za??_NR7p0ib)8nbK`(K`b7;)lTqZY=8<|0dZP{t?i?H67e|$Wowd&;X>svag**9s_ z>lV-l?1v2@g%XOl>9OM@fA|dVnznbipHuCus8y zW|eKvrO{m)<v_xU z7B|-d8vFvlahJqqwC%Y09+j>G`suhh7t&fqv|2H}yqx$%{VLR`rCzTu&#L&`y|;hY z^8T$QG`c4$Vm&CujE3<}TNX?nTdmYscg3y!bPOddHdVaIK4*R3%Qji#*`Et8m(u7y znBD_epNU*1voetH=q&4v&iUX{HNo<#Z|E5!yI)Hgt@{Qq2Pw;K#N1dRycl>(XZHZ7 z+kJFtuarZsYwsW?a17=P`|*fSOl;NkZ9FD$K3S zh-1BxqItbvvHYs1j&+2KQkLMJjyWQJdVi>(;M3(o&C37bYCsi5!=GqBPiLv~BC`Nq$8FBq^Sf$kz1Q@pI(p3;dd*v4JjuTUC{n^+jGgU! zph_vTRr!a=O;|A`UDmVGKxuWxV0{Fh}*^yAALRkvP$|) zL+x5B3~sS*=)1XQ)Z3^RL33she}19SR~jm?O|V38J4zcvI}@pJAmj4*n)&5_ey?}D zSfrTvsF_ABG}3Q{NzEtEf@PzpDYLxpIi&WTl1x)sN)kC8U^-?)EA0E4Ch^LRFS zP%w+l|2*8-FJtucql|7KqaMVJ3TD)gF^e0?%b;1q*G7(nb$27pK0Ulv`nxHaGZ!mOU(GXg*M*pa-r zVr|3<_r;nl8X|seI7Bgk6(o3_CPS zqr1M=*sc$HYD6#^=NP?q+@XjRemvbd-_hSakfEN*Gah%nAIYF7U>ptjo+s(Gc7*ZF zta+D0W_81ky^Us23Lcd6NytCQiB7@=?Wa0)R#$4d)KiwUf zl9aeA!Exc@cL@wiWY8*z#p>wb&&wn)mT!VD7Iicfr%Nt^0z- zIeR|`tlw<+b4N%DgA5@uD)YQ{aFOFzgVEEKgZrCryu_eX2Bk5`>^6BEm@?eqz`KG& zr$?b`a|!v|$BYMIOmHwZS%ap7j8ir&6{Q)3qf6(*<6y~$=VD4PN7 z1qN+5bt^@im#L33(|*!^+EMp9qkeyDO^F-Eebk@Xdnf5|iKwFm<&W4LE1_5I4J6+Ky-l;I&7S&uK~F(@CHTmb3@!M3$R+(s3*p&~wi zvY;N{Ton6!VDew@hxIRH)QcF^n@kD~q-5p3y_u@zb?rsu!g)9CAFVECmY2ZN7*xtY zwX}(-#`*gU6gNzTlK7p2BIafnjc%6Jtsc5s`GA4YR4SwfczE;H%T`T)(yzC+YvR%} z29-1Dp{V$e!1Dgx?DM$O43##3Xbxb8e$%6EYix9WqJ0B>Ce1&;=Lu*PD7&btr3X|( zDNY&LJJTy{xTJafQwCLvFao!_DeR^vcZ{*U`RR+wm&8Bwo-wG3LDdZ4@~?1n?CYW~ z+FiYg5fy(-HHtGj^_)R37^E*I+L4cT@qC;iTiTKA4p+J;>>y3$!-@WxdcgCa`Q*MW_0Tq%{PqdThSEw zF7H6hVx0IMq-|K*4O~uFAVxB zA|l)>i8}+@n22a|sxrxzfW;9zE)XJb9-+(AFHH4y$C4ZY~0~Lc^O5vl* zA?9`Q+mt&CR&4E=)Hd%sgW4HL^E+VO3K=*^^e-;YGSvR!&LR&MqC}YECo0<(75_Ar zUjESOd+ft>PZk|!kr#``<>TJa*rxbbt4ltiZ*fq?<$6)X9>w0(=Dt3xsxPZ*_Xzic zr#f3gpfZ=Ony)D zfELO}8oHJw+G%)v-El0ee%etM1+r+as7ZhI{qs`Mz&)qWyUH>(G;seQRxg-E$5?cn zMJHI)^CSx_w=__S8(dAq4E_`l0>NbG{`l?aU6rmIhrHdY>$RFrypMzK&ngrr`7(Z-QoY{#s<&|9J&b#rAjyF7-~{6^kp z&I6s0GK;QIxb&{yoa~0f<8Kt`smE)k&5C8$#j&avSlDO0$ci3P+*lXejN;)XxoPJf zdjjZ%SQS$UTe`;@&aKrS)W?^W=DS%HC$cDs1^9yL|0Jtd^gb3~;W|CgwqR3oeKMq5>OCba8TS2=Z+qIT*!7*r{WD>z(C+cM;>?bff81bE4hw0Ls7q}Jy#E^aw9h+L zzxF|0XT0{h$*#M_>fUB`%3v=iiA-RHhkN=3uvJzjtEP{hr)M`c^$xrIEt3l>W^N)g zax{XTi^9A99?Fl)N8Y{O=UQL;M=5oT5WF;37(F@k>ZQ45P3KF^?C-KDk42O6VX;OA zc1C74kepQK89o!fTmdNI=xcY0+C3mz`dWOyM1Kg zPjn`E#O8PEg@vqo5v!R*7qbxe7@2_+c{Q@HWPbf_m8hAQ`y1DGX((aQJr=4Br66}P zQM56E05&9RgZ)GcKF{-lus!kusw)k6t1;b882PRn9YTS!_3(RDZ{(E4j8C35q#ek)FPVMg4 z#m82zvj}lN(K6<2J*)nK)x60RvmlU$`(9f|zp5Dj=$_u}Ghve41{R_~*fQ#N>hhoa z!v%{6E8;%K>J~M!>K|FvPptY|<{{Aqs`1V*$}Kn4jA`}UzBi)#r^HR4S@eYkANLhz z-X$}z?{r%H5c0;H!M;n~ybSeJD|-FW#OgM)I(99vw9b8;OhT|R{PF#cN{pAy)Z$F5 zr0J!tEQFd;;c<5^d;hdYy#}mjM&2Af@!>ZXwXx_sKpS2wMw^>c1X}-A#@0Ef%a0e{ zYO4xngyW(9-SuXL?e{gU95?U%54>H(L8)Nsejsdh`3)!Cqdlrd`YoE&!J;1`p)g37 ztSd%EYJH|xjH&58_QAE9pX~BI8MLr3dhwhAS}E_I9(JqNxn8!|i9^mDRDj-q8z}aA z#JB3~>dvjTw5^!cwfG>14slSv{s#A|>m%Pay`EomY4uLCdc5S43%ACVgA6%|OeO{6 zd){-tpHvKZbS5dV?kZW~#_6`h9l<7klSYU~lk@t|x>&T`F2Mu*alN-u`fG$Bbj$ zgvDocl+L@(rHu!tQ4U&J_&^RyKM;~Y&I7JvcWbKIw6g4yb6T(6iE-J(f;be+fpCs- zkYvKfJd|2~#h+tOG+{nNS6a>5u-L~fXF>Pl9F+f|bnu*Rx2N{ZJT`Al+Kwf=JWg=X zr6Cm_Tr7glCqJy`_7UCt>P+f#l0&CBs9lGMjIl8`fGr(jWJ!(P{4kTn5|8@GAqJrw z3geKeSOqEAoV4`Ghc#0Y>(6xS;XnWTX%4zCq(XDo*oV^8C3pL7wCp;;dn|Q^LuWat zV1VgQ8RW5V;iQ0Li4}?2W+4+dhI6nJ0+78?Be!o;mS5qaY1JpckiHQdItPryBcYLA zY#z1(9)J;+?vriBJl@UPxwmEbPvb0&C=Nw)$gBmhDlF~lq>IB$u7ywC)a%*#ydyCj zI?thfFy-rzYu<|=UF>phS3j%xe&#P@IWPgKaB|qeW&NV&FRdP1%>{mTvW?>)5Q1&m z#l?lQ_J#}{78EL(E^J$JfkPKXHj8^C(?=b9WcM_%s$}!ph2`kc!FWz{Sprb_uZA*( zK)CD-?By1cumf zYhwW}Le(fg^!xsn7nf!2mO(q$3`^y}#2}J>^D-ug?RaoHvxUfsAKo{OLzh8$SurVO zx)C)CrtLf5GeUE+Yo>8vI;;ZJjTCnyM=#m3Ghjw`-SjK4nljWFnQn0tGE4EJlwIgAgSx#kKM93l+7Xg>l{F- z(ouxci$4}}bw^YSHXN8V?TzB%%o`la;ULz&31$Fo1D&Y#)jq%H^r)_NZO8W+(K`=2 z+~Uw}4yrcmr9$S%6KB1yuD9;FV|H)cp!Mn48@GyuAi~G-OeK=p&MtP zTvX#TKaWHCA{(nf(B{5wlbRoYne>ACL$0%-<8%RN7A$t`>08!aN{(G?;AWLtv`}XX zIcSxW3ew@5wds)iD+ZQE?!t~-I9tS_Vh*ha+`^93`UM2>9`VIpmOC_VyIR7bd!nV3 z!a6MsZN$#z^N$}qoPX%n-mAIgGlF*z+wXJefw)f5mR)8~Gq3Nza!9mSX;jvODMQOR zRL-GAS)f^q3{Pk;RRpMHo3^(U@Y8G`a;qP4x{tZlPeh&M4^#k~ew~#7vo7;^xM059 z(X}S?+n*VIdBYxOg_$nL7HZ$tUsb&*JU@0^x0z2l?MhDl4UK z9fEhj@)Hxc515_2{EjbK#lb!R6lDk7RG6^`=PhdseOY?V_*6C6GY6%w7qBup>|Vjj zn1Ordd+c*dc9d(7rQyNjUUKLaP=6Veyh^W+Mp}@HLHjyWCg(4&AvL1qN`-HwMM(_Z zbClmue0^-@|n#IArpM!#tt&RNVc7or3&u z^`di2j@o*4dN5+nJ5^+-g@2*!5K_w{mb>k0x1yqy9(-t4AMTBp~{*rNK)>+e2$Ihm5b< zA3MppfkTZPG^~q($hlQvdy4yZq&3ucQOz25AnzlGK5_`;#D9MT5>aYE&bcl>-i`n>0ic$J51+uu5cXSM4K@1M zoTvC&cXVV^XfvnT!l|}$x^J0pqKF;E1Ou{F!7y&iPb-hw4f;!z25x+p8EqVNb4i5@ zC$4QZTHiA%*Zpi@jZQ+&cMi3~;z2k2yz3V@r@Ih+r@`By=J=G|t)!rIQcq4B=&Yi; zMxi@l+et|Whkl6ga0phIdt_*ARq*W8F!Oru!eIRCPY#N%PCRzVz*KnSsh?tcvU$RR zlnbT(CZ2li%&Q;dH4pK6Ni>v6Aa-$Iz+pE_apEeb`@W_=%(_r0yO>n0IXLaHWo*S2+cjMQ%^J_eK?Y*8n=4x$gr##Gyo9{9Mt81*VeCB~8uBhXh|BOU8 z&4G{oym;izLyzBMfRufLZRF=aWc{b@TG>A>|8%gPwLRJ&+@e%*5#!gS8o^TW5%c^6IRO?O{3 z+F*46kB;)dk3b*^I#*;4u+e0Yw>A7I>uOS&(tA(Z;3Yvkw8cVEqu3;yD(vmO)aZG4 z4gIeBgL#NBU;&G|ES5=K_G^yO3X2aqaety**gnho{1CK5VH$9BKzFb>iC$3T(a;u52XTVHrQKp@JZ(P`J+Cy z&VL?0!|?>KagtX%#g7W%SA_B_!gzF=hxGTij=qz^6x)I(*`}+1F8Qf5!K2fQV(UuV% zJ7eg{WUn64VTZ0}pW{&^51SYMAPyC+qO+!s4Xe6c*%SAnb+JPhqtmxy#_~8GUEra@ zCsqazUmRi8GW@jal}FviT^n(H)?!0K%=X0%O{EPP1gw+y>q8oMS3!m0n35> zv`6#kmoEuRw+~Cc&b7G{cO4g0gU26SAKKe{a>Zx0f~`*5GI^B6Lp=)&ve)76)T2I@ zxkDOuIPE`HWS`BW>pZyN8!!*7$+oj$`!GLc=PgxvmlK(j6X!2C89Uj;P!=;=viHlDv3orT1~(CJp7L(p80xg*+dN_li2tn~qpd5dR9%&qNhI=8W$-t_HSwJ)jd^07JNeTgz@8LwN;>ptYQ zmp%fX{C$4yHh+f~&Sl&Qnu+PJSnyM8@T}po6OVcHgojpMAfceg=^;G=4Ry`idwp*? z^HsNkM^AYG^hyw=*xw9$viB}*N~p`L{IdAzyM=gG$uoX=6+fz)*Y5U+=W|)1@~B(& zr<=90Yd(LuvVQXLqURtm(WEj#7oRj9I{EA04JgNnZ5QBb) z8T@OIhge(zMKKn>Pk9sA*K&2=<*$}3ae4mIr;bN&c-RXNQ{CP61zf87ZdvlX11lQN zqolVm5t!Ly-l=cUUF&}OtD5pRwXXR2jz{l#D8AQ&y(l{OR;0qrRb6WQ{4%{#3e&4R zlZ+}q@Tft28yKKacFiC2szXvWc;j-l5suD{{PH(Y^ARqu)eZIi_|&8C=Ed70-<|aO z$fHm2R_7M~g~Gs^ymx+q9d+i)8!txn`OKp)Jo*YNgWDphpLhAp>n4x1yOlkDxo_>x zK25xCGq3vz@07--Zgs9NhK=EFP26_&Qx{{u79O?oP>B2n1Ow{A`2?vz-s0SDEIhR+ zZOExJt@l=(TqKxeSycs@j-I>8=E%MU+YD#5@#s4bIVLQD#@CnI4Iec%p;yngRrvuo z+IiH$Ly+`?$9%<8MsUbP^n)UBG+4<|g430t*iU`0gbQY8e)7mk0?~ySPiZF%5BNT( zBYLZL#{~9!?M!D0Iw*mP_aRBAH?W0R0-SX0`h$-&r`$PRW%4X#{KG#RTqMX<0(lHr zOtQ}(Gxf4U@7eL)L&KC?8{H(xT>_nujlhwniTjrM&&e1lN#7J(J;z?|A%PYw=$tI9 zdwzR7lh#nHAEe00R(MLF8wsM%MSFJI`P>!8^e9@iUHLBiumpL*|Ll7J`syL}PSWMx zXNf001BPn026{`-I5>*1K!1n|rRk_TySC`tNZZvu;^R^wDyq?}@qzK_gs*4$;Vlss zz7n(r-0Jg;?vB^JXF2Q5*wZrhTn|499C%H=Tg(!lLL+Ep}r{gU+R1%O!W~?Ff*dqY~(H02xeZ=)SwDF-}#j&)zb7EHyk( zf`TM~$j3M+LZk$ID;#b5XG)I6&+WHUn}dNV5-2ooGR{0M z0f!BA&o~h|^s{7vV`5vXec93;CnV^k1bk;0tZBTdxo6OT1=k)u&KPg{#Nxy$2?`Nq z*aR|sc5=yypRH}JipyoK&0RYVg-TGE1R0(N5gOYVb=D)L!s5wumQ_x<68*GVd)tCV zANey9owJf9;gV4i67_QujYtUu=zJ8g!(6U3mnonjFB;zeyOY4NjS(ity;ZAus83h?z6e!8s!7EPF39+H}62a1SJ5s$V3V36T`t) z@vzOL9$UW!WRIM(An=bqK68>l_dqqp(#hr#!Mgh#w{|7@x@+HpPJd64s5-NkB-kNa zb0Oz8_ulel?g?ueqf6BcuWn5jZ$RE}R66(%JLTR-AuBSZA1`dYB3bQ2K_p#l6JurCvu$5T z6zB4zyT*az_)IMES9@FM!R=u-Cd0=5eVQ6|9ue%UFN_^#W}p~m1a&cJ2-Jq7;?WfL zior1=p6idjh7WiphwX%m9NU9q3c;UWy5PlMOXFb`|_!0IjegRLwkFuBWEBH-3 zihYbHvM=xtxHEBx@F22TKjH>^iijmH5_j2b;s%jV6tE?11yR9Pv6XB!QA0du-x4+K z2jVUJ1rCg~5e@8Twu5M8zp+1wgQOpMg!Csn*g*0Od60`G-8nz*ICqje!CfIwb7#14 zE`p2UV!2{6jw>fC$VcRJ@+J9-d_$&kY1~yVlS}8Es4UK%y20Jy3OGNikPD)UxcgiQ z7eQ5XRa^~siAtkVsC4Q*_knBRK5}2U@7yh_gS$()@Q)}j-iLop`SSJDXDWbirM^?g z_@C54`Z(`JpW)B)zH|hCl#bz#(--*=I)e|V&(PU?CLc-1(0Tktx|mO;FVpwBsa_x{iO#zoI|T@Awb=XZj=mng2q!@Xd4^@4~e6KY2ICS>nyONn9iz5>Lrt ziMPZ@62SOMPB8(JFy=H9EIBTTWTKh#OdNAclE8#YQke6S%gi0-f+R_j$D~TqB>Q5W!2esdpe~30eYh9>eXO5-t+wigC@UYrs@fs(=UW>znF{Fs!V_EDYd?yNN;7t>JTId3H zkU1 zJa!p|hgJGZuxsL{AR?H;@!kQM3x1od{_jB>;Yyq%p8~$YCnkq- z0s7szd@_Q;fRY z0*n9eaXW47*Pn4f|AQgd;60*}1Fl{dKY5Fabw~WvA12HfKU^c>X1qAfD+YTe{?ch| zuSqQ9zi0YqA^ht|%5O`mhk-z88^rNSsY4X@S^U($guq(FJ0SP(U@7nb19LR4& zcaT`pe^d4gXa0R43UN zb*7L3o%a^s0DF8Wat5q0So{uTAO8pC6lecM_P;i}K@goMA%7$MDGUX`Qb7S1j>B+7 zKH0=#q2jQj&N;RYha&>NCe48>Xo84<;(F6rtXaGQ9<+kEI^T_ETS$1fRD2^I%$34!|1Ukq zuhpRcwB`Rs?oV-|S{ifa;R+0{fC&KcBgDzv#NYN{)#98kH0CdUy$J>)e!oUy4RHOX z+`({%aN)paK1k4n&!BiQf`ZT-?x_<)R7!kr|(XrHNHkbBe zUUN}g0bR#F=Pz)jWFl8dM)7H^>?D1WX=gLoOU!lFi7TSclDT{y=g$UlsbnaZ2}Fql zf~6*k!~p{@!4;(ZOr-xh{y$X}{$>sO_g}0*u-k5}{EZ(u;y5r~tT?U*g(Zkr;LA0* zGA{Hl{kcuU=w;%Qa3>q?fS^H1pNYSK4&9`&3;(S{qLTinoAxJtYaY^&{jj>a1QUVf8!h2IzbPayq`gTF20n>Yvv-&urs;GqYD zW&aZ&{wX98PoQ^}1%4aR7e*rM!K(wm{Uq4U|E0?RCs^vt9Df_~s7PEegZWE<-3?R` zfknVCR1Vb!zk-8I62Fy#BS>K(W;r81)e3ft#YnKL|J%j<4?l2Dgx?G*g2dv)0dKPY zJeDC6QU_WpUO|uQMDDq=SS45_lR=4-LcBr)ABBJRgTF!bZ);3}N&a6J@qb?yQTVs2 z6pPnj9=if^7OfO>f@00IL3?^hro$gg*4VI_WAaTyVM5Foj~O|-84 z$;06hMwt*rV;^8iB z1~&0XWpYJmG?Ts^K9PC62H*`G}xom%S%yq|xvG~FIfP=9*f zZoDRJBm*Y0aId=qJ?7dyb)6)JGWGwe)MHeNSzhi)Ko6J<-m@v=a%NsP537lHe0R* z`If4$aaBA#S=w!2z&m>{lpTy^Lm^mg*3?M&7HFv}7K6x*cukLIGX;bQG|QWdn{%_6 zHnwBKr84#B7Z+AnBXa16a?or^R?+>$4`}{*a_>IhbjvyTtWkHw)|ay)ahWUd-qq$~ zMbh6roVsj;_qnC-R{G+Cy6bApVOinSU-;(DxUEl!i2)1EeQ9`hrfqj(nKI7?Z>Xur zoJz-a`PxkYit1HEbv|jy%~DO^13J-ut986EEG=66S}D3!L}Efp;Bez~7tNq{QsUMm zh9~(HYg1pA*=37C0}n4g&bFbQ+?-h-W}onYeE{q;cIy%eZK9wZjSwGvT+&Cgv z?~{9p(;bY_1+k|wkt_|N!@J~aoY@|U_RGoWX<;p{Nu*D*&_phw`8jYkMNpRTWx1H* z>J-Mi_!`M468#5Aix$$u1M@rJEIOc?k^QBc?T(#=n&*5eS#u*Y)?L8Ha$9wRWdH^3D4|Ps)Y?m0q~SiKiSfEkJ!=^`lJ(%W3o|CZ zSrZL-Xxc{OrmsQD&s~zPfNJOpSZUl%V8tdG%ei}lQkM+z@-4etFPR>GOH9+Y_F<3=~SXln9Kb-o~f>2a6Xz@AS3cn^;c_>lUwlK(n>z?A>NbC z`Ud8^aQy>wy=$)w;JZzA)_*Y$Z5hU=KAG&htLw1Uh00yE!|Nu{EZkch zY9O6x7Y??>!7pUNME*d!=R#s)ghr|R#41l!c?~=3CS8&zr6*aA7n9*)*PWBV2w+&I zpW1-9fr3j{VTcls1>ua}F*bbju_Xq%^v;-W~paSqlf zolj*dt`BBjHI)H9{zrkBo=B%>8}4jeBO~kWqO!~Thi!I1H(in=n^fS%nuL=X2+s!p}HfTU#NBGiwEBF^^tKU zbhhv+0dE-sbK$>J#t-J!B$TMgN@Wh5wTtK2BG}4BGfsZOoRUS#G8Cxv|6EI*n&Xxq zt{&OxCC+BNqz$9b0WM7_PyBJEVObHFh%%`~!@MNZlo*oXDCwDcFwT~Rls!aApL<)^ zbBftGKKBRhB!{?fX@l2_y~%ygNFfF(XJzHh#?`WlSL{1lKT*gJM zs>bd^H9NCxqxn(IOky5k-wALFowQr(gw%|`0991u#9jXQh?4l|l>pd6a&rx|v=fPJ z1mutj{YzpJ_gsClbWFk(G}bSlFi-6@mwoQh-XeD*j@~huW4(8ub%^I|azA)h2t#yG z7e_V_<4jlM3D(I+qX}yEtqj)cpzN*oCdYHa!nm%0t^wHm)EmFP*|FMw!tb@&`G-u~ zK)=Sf6z+BiTAI}}i{*_Ac$ffr*Wrv$F7_0gJkjx;@)XjYSh`RjAgrCck`x!zP>Ifu z&%he4P|S)H*(9oB4uvH67^0}I-_ye_!w)u3v2+EY>eD3#8QR24<;7?*hj8k~rS)~7 zSXs5ww)T(0eHSp$hEIBnW|Iun<_i`}VE0Nc$|-R}wlSIs5pV{g_Dar(Zz<4X3`W?K z6&CAIl4U(Qk-tTcK{|zYF6QG5ArrEB!;5s?tW7 zrE3hcFY&k)+)e{+YOJ0X2uDE_hd2{|m_dC}kgEKqiE9Q^A-+>2UonB+L@v3$9?AYw zVQv?X*pK;X4Ovc6Ev5Gbg{{Eu*7{N3#0@9oMI~}KnObQE#Y{&3mM4`w%wN+xrKYgD zB-ay0Q}m{QI;iY`s1Z^NqIkjrTlf`B)B#MajZ#9u41oRBC1oM1vq0i|F59> z#StM@bHt|#`2)cpl_rWB($DNJ3Lap}QM-+A$3pe}NyP(@+i1>o^fe-oxX#Bt`mcQc zb?pD4W%#ep|3%CHAYnr*^M6Czg>~L4?l16H1OozM{P*en298b+`i4$|w$|4AHbzqB zHpYUsHZET$Z0ztC;U+0*+amF!@PI%^oUIZy{`L{%O^i{Xk}X0&nl)n~tVEpcAJSJ} zverw15zP1P-O8h9nd!&hj$zuwjg?DoxYIw{jWM zW5_pj+wFy8Tsa9g<7Qa21WaV&;ejoYflRKcz?#fSH_)@*QVlN2l4(QNk| z4aPnv&mrS&0|6NHq05XQw$J^RR9T{3SOcMKCXIR1iSf+xJ0E_Wv?jEc*I#ZPzyJN2 zUG0UOXHl+PikM*&g$U@g+KbG-RY>uaIl&DEtw_Q=FYq?etc!;hEC_}UX{eyh%dw2V zTTSlap&5>PY{6I#(6`j-9`D&I#|YPP8a;(sOzgeKDWsLa!i-$frD>zr-oid!Hf&yS z!i^cr&7tN}OOGmX2)`8k?Tn!!4=tz~3hCTq_9CdiV!NIblUDxHh(FJ$zs)B2(t5@u z-`^RA1ShrLCkg0)OhfoM;4Z{&oZmAec$qV@ zGQ(7(!CBk<5;Ar%DLJ0p0!ResC#U<+3i<|vib1?{5gCebG7$F7URKZXuX-2WgF>YJ^i zMhHDBsh9PDU8dlZ$yJKtc6JA#y!y$57%sE>4Nt+wF1lfNIWyA`=hF=9Gj%sRwi@vd z%2eVV3y&dvAgyuJ=eNJR+*080dbO_t@BFJO<@&#yqTK&+xc|FRR;p;KVk@J3$S{p` zGaMj6isho#%m)?pOG^G0mzOAw0z?!AEMsv=0T>WWcE>??WS=fII$t$(^PDPMU(P>o z_*0s^W#|x)%tx8jIgZY~A2yG;US0m2ZOQt6yJqW@XNY_>_R7(Nxb8Ged6BdYW6{prd!|zuX$@Q2o6Ona8zzYC1u!+2!Y$Jc9a;wy+pXt}o6~Bu1oF1c zp7Y|SBTNi@=I(K%A60PMjM#sfH$y*c{xUgeSpi#HB`?|`!Tb&-qJ3;vxS!TIzuTZs-&%#bAkAyw9m4PJgvey zM5?up*b}eDEY+#@tKec)-c(#QF0P?MRlD1+7%Yk*jW;)`f;0a-ZJ6CQA?E%>i2Dt7T9?s|9ZF|KP4;CNWvaVKZ+Qeut;Jith_y{v*Ny6Co6!8MZx;Wgo z=qAi%&S;8J{iyD&>3CLCQdTX*$+Rx1AwA*D_J^0>suTgBMBb=*hefV+Ars#mmr+YsI3#!F@Xc1t4F-gB@6aoyT+5O(qMz*zG<9Qq*f0w^V!03rpr*-WLH}; zfM{xSPJeu6D(%8HU%0GEa%waFHE$G?FH^kMS-&I3)ycx|iv{T6Wx}9$$D&6{%1N_8 z_CLw)_9+O4&u94##vI9b-HHm_95m)fa??q07`DniVjAy`t7;)4NpeyAY(aAk(+T_O z1om+b5K2g_B&b2DCTK<>SE$Ode1DopAi)xaJjU>**AJK3hZrnhEQ9E`2=|HHe<^tv z63e(bn#fMWuz>4erc47}!J>U58%<&N<6AOAewyzNTqi7hJc|X{782&cM zHZYclNbBwU6673=!ClmxMfkC$(CykGR@10F!zN1Se83LR&a~$Ht&>~43OX22mt7tcZUpa;9@q}KDX3O&Ugp6< zLZLfIMO5;pTee1vNyVC$FGxzK2f>0Z-6hM82zKg44nWo|n}$Zk6&;5ry3`(JFEX$q zK&KivAe${e^5ZGc3a9hOt|!UOE&OocpVryE$Y4sPcs4rJ>>Kbi2_subQ9($2VN(3o zb~tEzMsHaBmBtaHAyES+d3A(qURgiskSSwUc9CfJ@99&MKp2sooSYZu+-0t0+L*!I zYagjOlPgx|lep9tiU%ts&McF6b0VE57%E0Ho%2oi?=Ks+5%aj#au^OBwNwhec zta6QAeQI^V!dF1C)>RHAmB`HnxyqWx?td@4sd15zPd*Fc9hpDXP23kbBenBxGeD$k z;%0VBQEJ-C)&dTAw_yW@k0u?IUk*NrkJ)(XEeI z9Y>6Vel>#s_v@=@0<{4A{pl=9cQ&Iah0iD0H`q)7NeCIRz8zx;! z^OO;1+IqoQNak&pV`qKW+K0^Hqp!~gSohcyS)?^P`JNZXw@gc6{A3OLZ?@1Uc^I2v z+X!^R*HCm3{7JPq{8*Tn>5;B|X7n4QQ0Bs79uTU%nbqOJh`nX(BVj!#f;#J+WZxx4 z_yM&1Y`2XzhfqkIMO7tB3raJKQS+H5F%o83bM+hxbQ zeeJm=Dvix$2j|b4?mDacb67v-1^lTp${z=jc1=j~QD>7c*@+1?py>%Kj%Ejp7Y-!? z8iYRUlGVrQPandAaxFfks53@2EC#0)%mrnmGRn&>=$H$S8q|kE_iWko4`^vCS2aWg z#!`RHUGyOt*k?bBYu3*j3u0gB#v(3tsije zgIuNNWNtrOkx@Pzs;A9un+2LX!zw+p3_NX^Sh09HZAf>m8l@O*rXy_82aWT$Q>iyy zqO7Of)D=wcSn!0+467&!Hl))eff=$aneB?R!YykdKW@k^_uR!+Q1tR)+IJb`-6=jj zymzA>Sv4>Z&g&WWu#|~GcP7qP&m*w-S$)7Xr;(duqCTe7p8H3k5>Y-n8438+%^9~K z3r^LIT_K{i7DgEJjIocw_6d0!<;wKT`X;&vv+&msmhAAnIe!OTdybPctzcEzBy88_ zWO{6i4YT%e4^WQZB)KHCvA(0tS zHu_Bg+6Ko%a9~$EjRB90`P(2~6uI@SFibxct{H#o&y40MdiXblu@VFXbhz>Nko;7R z70Ntmm-FePqhb%9gL+7U8@(ch|JfH5Fm)5${8|`Lef>LttM_iww6LW2X61ldBmG0z zax3y)njFe>j*T{i0s8D4=L>X^j0)({R5lMGVS#7(2C9@AxL&C-lZQx~czI7Iv+{%1 z2hEG>RzX4S8x3v#9sgGAnPzptM)g&LB}@%E>fy0vGSa(&q0ch|=ncKjNrK z`jA~jObJhrJ^ri|-)J^HUyeZXz~XkBp$VhcTEcTdc#a2EUOGVX?@mYx#Vy*!qO$Jv zQ4rgOJ~M*o-_Wptam=~krnmG*p^j!JAqoQ%+YsDFW7Cc9M%YPiBOrVcD^RY>m9Pd< zu}#9M?K{+;UIO!D9qOpq9yxUquQRmQNMo0pT`@$pVt=rMvyX)ph(-CCJLvUJy71DI zBk7oc7)-%ngdj~s@76Yse3L^gV0 z2==qfp&Q~L(+%RHP0n}+xH#k(hPRx(!AdBM$JCfJ5*C=K3ts>P?@@SZ_+{U2qFZb>4kZ{Go37{# zSQc+-dq*a-Vy4?taS&{Ht|MLRiS)Sn14JOONyXqPNnpq&2y~)6wEG0oNy>qvod$FF z`9o&?&6uZjhZ4_*5qWVrEfu(>_n2Xi2{@Gz9MZ8!YmjYvIMasE9yVQL10NBrTCczq zcTY1q^PF2l!Eraguf{+PtHV3=2A?Cu&NN&a8V(y;q(^_mFc6)%Yfn&X&~Pq zU1?qCj^LF(EQB1F`8NxNjyV%fde}dEa(Hx=r7$~ts2dzDwyi6ByBAIx$NllB4%K=O z$AHz1<2bTUb>(MCVPpK(E9wlLElo(aSd(Os)^Raum`d(g9Vd_+Bf&V;l=@mM=cC>) z)9b0enb)u_7V!!E_bl>u5nf&Rl|2r=2F3rHMdb7y9E}}F82^$Rf+P8%dKnOeKh1vs zhH^P*4Ydr^$)$h@4KVzxrHyy#cKmWEa9P5DJ|- zG;!Qi35Tp7XNj60=$!S6U#!(${6hyh7d4q=pF{`0t|N^|L^d8pD{O9@tF~W;#Je*P z&ah%W!KOIN;SyAEhAeTafJ4uEL`(RtnovM+cb(O#>xQnk?dzAjG^~4$dFn^<@-Na3 z395;wBnS{t*H;Jef2eE!2}u5Ns{AHj>WYZDgQJt8v%x?9{MXqJsGP|l%OiZqQ1aB! z%E=*Ig`(!tHh>}4_z5IMpg{49UvD*Pp9!pxt_gdAW%sIf3k6CTycOT1McPl=_#0?8 zVjz8Hj*Vy9c5-krd-{BQ{6Xy|P$6LJvMuX$* zA+@I_66_ET5l2&gk9n4$1M3LN8(yEViRx&mtd#LD}AqEs?RW=xKC(OCWH;~>(X6h!uDxXIPH06xh z*`F4cVlbDP`A)-fzf>MuScYsmq&1LUMGaQ3bRm6i7OsJ|%uhTDT zlvZA1M}nz*SalJWNT|`dBm1$xlaA>CCiQ zK`xD-RuEn>-`Z?M{1%@wewf#8?F|(@1e0+T4>nmlSRrNK5f)BJ2H*$q(H>zGD0>eL zQ!tl_Wk)k*e6v^m*{~A;@6+JGeWU-q9>?+L_#UNT%G?4&BnOgvm9@o7l?ov~XL+et zbGT)|G7)KAeqb=wHSPk+J1bdg7N3$vp(ekjI1D9V$G5Cj!=R2w=3*4!z*J-r-cyeb zd(i2KmX!|Lhey!snRw z?#$Gu%S^SQEKt&kep)up#j&9}e+3=JJBS(s>MH+|=R(`8xK{mmndWo_r`-w1#SeRD&YtAJ#GiVI*TkQZ}&aq<+bU2+coU3!jCI6E+Ad_xFW*ghnZ$q zAoF*i&3n1j#?B8x;kjSJD${1jdRB;)R*)Ao!9bd|C7{;iqDo|T&>KSh6*hCD!rwv= zyK#F@2+cv3=|S1Kef(E6Niv8kyLVLX&e=U;{0x{$tDfShqkjUME>f8d(5nzSkY6@! z^-0>DM)wa&%m#UF1F?zR`8Y3X#tA!*7Q$P3lZJ%*KNlrk_uaPkxw~ zxZ1qlE;Zo;nb@!SMazSjM>;34ROOoygo%SF);LL>rRonWwR>bmSd1XD^~sGSu$Gg# zFZ`|yKU0%!v07dz^v(tY%;So(e`o{ZYTX`hm;@b0%8|H>VW`*cr8R%3n|ehw2`(9B+V72`>SY}9^8oh$En80mZK9T4abVG*to;E z1_S6bgDOW?!Oy1LwYy=w3q~KKdbNtyH#d24PFjX)KYMY93{3-mPP-H>@M-_>N~DDu zENh~reh?JBAK=TFN-SfDfT^=+{w4ea2KNWXq2Y<;?(gf(FgVp8Zp-oEjKzB%2Iqj;48GmY3h=bcdYJ}~&4tS`Q1sb=^emaW$IC$|R+r-8V- zf0$gGE(CS_n4s>oicVk)MfvVg#I>iDvf~Ov8bk}sSxluG!6#^Z_zhB&U^`eIi1@j( z^CK$z^stBHtaDDHxn+R;3u+>Lil^}fj?7eaGB z&5nl^STqcaBxI@v>%zG|j))G(rVa4aY=B@^2{TFkW~YP!8!9TG#(-nOf^^X-%m9{Z zCC?iC`G-^RcBSCuk=Z`(FaUUe?hf3{0C>>$?Vs z`2Uud9M+T&KB6o4o9kvdi^Q=Bw!asPdxbe#W-Oaa#_NP(qpyF@bVxv5D5))srkU#m zj_KA+#7sqDn*Ipf!F5Byco4HOSd!Ui$l94|IbW%Ny(s1>f4|Mv^#NfB31N~kya9!k zWCGL-$0ZQztBate^fd>R!hXY_N9ZjYp3V~4_V z#eB)Kjr8yW=+oG)BuNdZG?jaZlw+l_ma8aET(s+-x+=F-t#Qoiuu1i`^x8Sj>b^U} zs^z<()YMFP7CmjUC@M=&lA5W7t&cxTlzJAts*%PBDAPuqcV5o7HEnqjif_7xGt)F% zGx2b4w{@!tE)$p=l3&?Bf#`+!-RLOleeRk3 z7#pF|w@6_sBmn1nECqdunmG^}pr5(ZJQVvAt$6p3H(16~;vO>?sTE`Y+mq5YP&PBo zvq!7#W$Gewy`;%6o^!Dtjz~x)T}Bdk*BS#=EY=ODD&B=V6TD2z^hj1m5^d6s)D*wk zu$z~D7QuZ2b?5`p)E8e2_L38v3WE{V`bVk;6fl#o2`) z99JsWhh?$oVRn@$S#)uK&8DL8>An0&S<%V8hnGD7Z^;Y(%6;^9!7kDQ5bjR_V+~wp zfx4m3z6CWmmZ<8gDGUyg3>t8wgJ5NkkiEm^(sedCicP^&3D%}6LtIUq>mXCAt{9eF zNXL$kGcoUTf_Lhm`t;hD-SE)m=iBnxRU(NyL}f6~1uH)`K!hmYZjLI%H}AmEF5RZt z06$wn63GHnApHXZZJ}s^s)j9(BM6e*7IBK6Bq(!)d~zR#rbxK9NVIlgquoMq z=eGZ9NR!SEqP6=9UQg#@!rtbbSBUM#ynF);zKX+|!Zm}*{H z+j=d?aZ2!?@EL7C~%B?6ouCKLnO$uWn;Y6Xz zX8dSwj732u(o*U3F$F=7xwxm>E-B+SVZH;O-4XPuPkLSt_?S0)lb7EEg)Mglk0#eS z9@jl(OnH4juMxY+*r03VDfPx_IM!Lmc(5hOI;`?d37f>jPP$?9jQQIQU@i4vuG6MagEoJrQ=RD7xt@8E;c zeGV*+Pt+t$@pt!|McETOE$9k=_C!70uhwRS9X#b%ZK z%q(TIUXSS^F0`4Cx?Rk07C6wI4!UVPeI~-fxY6`YH$kABdOuiRtl73MqG|~AzZ@iL&^s?24iS;RK_pdlWkhcF z@Wv-Om(Aealfg)D^adlXh9Nvf~Uf@y;g3Y)i(YP zEXDnb1V}1pJT5ZWyw=1i+0fni9yINurD=EqH^ciOwLUGi)C%Da)tyt=zq2P7pV5-G zR7!oq28-Fgn5pW|nlu^b!S1Z#r7!Wtr{5J5PQ>pd+2P7RSD?>(U7-|Y z7ZQ5lhYIl_IF<9?T9^IPK<(Hp;l5bl5tF9>X-zG14_7PfsA>6<$~A338iYRT{a@r_ zuXBaT=`T5x3=s&3=RYx6NgG>No4?5KFBVjE(swfcivcIpPQFx5l+O;fiGsOrl5teR z_Cm+;PW}O0Dwe_(4Z@XZ)O0W-v2X><&L*<~*q3dg;bQW3g7)a#3KiQP>+qj|qo*Hk z?57>f2?f@`=Fj^nkDKeRkN2d$Z@2eNKpHo}ksj-$`QKb6n?*$^*%Fb3_Kbf1(*W9K>{L$mud2WHJ=j0^=g30Xhg8$#g^?36`p1fm;;1@0Lrx+8t`?vN0ZorM zSW?rhjCE8$C|@p^sXdx z|NOHHg+fL;HIlqyLp~SSdIF`TnSHehNCU9t89yr@)FY<~hu+X`tjg(aSVae$wDG*C zq$nY(Y494R)hD!i1|IIyP*&PD_c2FPgeY)&mX1qujB1VHPG9`yFQpLFVQ0>EKS@Bp zAfP5`C(sWGLI?AC{XEjLKR4FVNw(4+9b?kba95ukgR1H?w<8F7)G+6&(zUhIE5Ef% z=fFkL3QKA~M@h{nzjRq!Y_t!%U66#L8!(2-GgFxkD1=JRRqk=n%G(yHKn%^&$dW>; zSjAcjETMz1%205se$iH_)ZCpfg_LwvnsZQAUCS#^FExp8O4CrJb6>JquNV@qPq~3A zZ<6dOU#6|8+fcgiA#~MDmcpIEaUO02L5#T$HV0$EMD94HT_eXLZ2Zi&(! z&5E>%&|FZ`)CN10tM%tLSPD*~r#--K(H-CZqIOb99_;m|D5wdgJ<1iOJz@h2Zkq?} z%8_KXb&hf=2Wza(Wgc;3v3TN*;HTU*q2?#z&tLn_U0Nt!y>Oo>+2T)He6%XuP;fgn z-G!#h$Y2`9>Jtf}hbVrm6D70|ERzLAU>3zoWhJmjWfgM^))T+2u$~5>HF9jQDkrXR z=IzX36)V75PrFjkQ%TO+iqKGCQ-DDXbaE;C#}!-CoWQx&v*vHfyI>$HNRbpvm<`O( zlx9NBWD6_e&J%Ous4yp~s6)Ghni!I6)0W;9(9$y1wWu`$gs<$9Mcf$L*piP zPR0Av*2%ul`W;?-1_-5Zy0~}?`e@Y5A&0H!^ApyVTT}BiOm4GeFo$_oPlDEyeGBbh z1h3q&Dx~GmUS|3@4V36&$2uO8!Yp&^pD7J5&TN{?xphf*-js1fP?B|`>p_K>lh{ij zP(?H%e}AIP?_i^f&Li=FDSQ`2_NWxL+BB=nQr=$ zHojMlXNGauvvwPU>ZLq!`bX-5F4jBJ&So{kE5+ms9UEYD{66!|k~3vsP+mE}x!>%P za98bAU0!h0&ka4EoiDvBM#CP#dRNdXJcb*(%=<(g+M@<)DZ!@v1V>;54En?igcHR2 zhubQMq}VSOK)onqHfczM7YA@s=9*ow;k;8)&?J3@0JiGcP! zP#00KZ1t)GyZeRJ=f0^gc+58lc4Qh*S7RqPIC6GugG1gXe$LIQMRCo8cHf^qXgAa2 z`}t>u2Cq1CbSEpLr~E=c7~=Qkc9-vLE%(v9N*&HF`(d~(0`iukl5aQ9u4rUvc8%m) zr2GwZN4!s;{SB87lJB;veebPmqE}tSpT>+`t?<457Q9iV$th%i__Z1kOMAswFldD6 ztbOvO337S5o#ZZgN2G99_AVqPv!?Gmt3pzgD+Hp3QPQ`9qJ(g=kjvD+fUSS3upJn! zqoG7acIKEFRX~S}3|{EWT$kdz#zrDlJU(rPkxjws_iyLKU8+v|*oS_W*-guAb&Pj1 z35Z`3z<&Jb@2Mwz=KXucNYdY#SNO$tcVFr9KdKm|%^e-TXzs6M`PBper%ajkrIyUe zp$vVxVs9*>Vp4_1NC~Zg)WOCPmOxI1V34QlG4!aSFOH{QqSVq1^1)- z0P!Z?tT&E-ll(pwf0?=F=yOzik=@nh1Clxr9}Vij89z)ePDSCYAqw?lVI?v?+&*zH z)p$CScFI8rrwId~`}9YWPFu0cW1Sf@vRELs&cbntRU6QfPK-SO*mqu|u~}8AJ!Q$z znzu}50O=YbjwKCuSVBs6&CZR#0FTu)3{}qJJYX(>QPr4$RqWiwX3NT~;>cLn*_&1H zaKpIW)JVJ>b{uo2oq>oQt3y=zJjb%fU@wLqM{SyaC6x2snMx-}ivfU<1- znu1Lh;i$3Tf$Kh5Uk))G!D1UhE8pvx&nO~w^fG)BC&L!_hQk%^p`Kp@F{cz>80W&T ziOK=Sq3fdRu*V0=S53rcIfWFazI}Twj63CG(jOB;$*b`*#B9uEnBM`hDk*EwSRdwP8?5T?xGUKs=5N83XsR*)a4|ijz|c{4tIU+4j^A5C<#5 z*$c_d=5ml~%pGxw#?*q9N7aRwPux5EyqHVkdJO=5J>84!X6P>DS8PTTz>7C#FO?k#edkntG+fJk8ZMn?pmJSO@`x-QHq;7^h6GEXLXo1TCNhH z8ZDH{*NLAjo3WM`xeb=X{((uv3H(8&r8fJJg_uSs_%hOH%JDD?hu*2NvWGYD+j)&` zz#_1%O1wF^o5ryt?O0n;`lHbzp0wQ?rcbW(F1+h7_EZZ9{>rePvLAPVZ_R|n@;b$;UchU=0j<6k8G9QuQf@76oiE*4 zXOLQ&n3$NR#p4<5NJMVC*S);5x2)eRbaAM%VxWu9ohlT;pGEk7;002enCbQ>2r-us z3#bpXP9g|mE`65VrN`+3mC)M(eMj~~eOf)do<@l+fMiTR)XO}422*1SL{wyY(%oMpBgJagtiDf zz>O6(m;};>Hi=t8o{DVC@YigqS(Qh+ix3Rwa9aliH}a}IlOCW1@?%h_bRbq-W{KHF z%Vo?-j@{Xi@=~Lz5uZP27==UGE15|g^0gzD|3x)SCEXrx`*MP^FDLl%pOi~~Il;dc z^hrwp9sYeT7iZ)-ajKy@{a`kr0-5*_!XfBpXwEcFGJ;%kV$0Nx;apKrur zJN2J~CAv{Zjj%FolyurtW8RaFmpn&zKJWL>(0;;+q(%(Hx!GMW4AcfP0YJ*Vz!F4g z!ZhMyj$BdXL@MlF%KeInmPCt~9&A!;cRw)W!Hi@0DY(GD_f?jeV{=s=cJ6e}JktJw zQORnxxj3mBxfrH=x{`_^Z1ddDh}L#V7i}$njUFRVwOX?qOTKjfPMBO4y(WiU<)epb zvB9L=%jW#*SL|Nd_G?E*_h1^M-$PG6Pc_&QqF0O-FIOpa4)PAEPsyvB)GKasmBoEt z?_Q2~QCYGH+hW31x-B=@5_AN870vY#KB~3a*&{I=f);3Kv7q4Q7s)0)gVYx2#Iz9g(F2;=+Iy4 z6KI^8GJ6D@%tpS^8boU}zpi=+(5GfIR)35PzrbuXeL1Y1N%JK7PG|^2k3qIqHfX;G zQ}~JZ-UWx|60P5?d1e;AHx!_;#PG%d=^X(AR%i`l0jSpYOpXoKFW~7ip7|xvN;2^? zsYC9fanpO7rO=V7+KXqVc;Q5z%Bj})xHVrgoR04sA2 zl~DAwv=!(()DvH*=lyhIlU^hBkA0$e*7&fJpB0|oB7)rqGK#5##2T`@_I^|O2x4GO z;xh6ROcV<9>?e0)MI(y++$-ksV;G;Xe`lh76T#Htuia+(UrIXrf9?

L(tZ$0BqX1>24?V$S+&kLZ`AodQ4_)P#Q3*4xg8}lMV-FLwC*cN$< zt65Rf%7z41u^i=P*qO8>JqXPrinQFapR7qHAtp~&RZ85$>ob|Js;GS^y;S{XnGiBc zGa4IGvDl?x%gY`vNhv8wgZnP#UYI-w*^4YCZnxkF85@ldepk$&$#3EAhrJY0U)lR{F6sM3SONV^+$;Zx8BD&Eku3K zKNLZyBni3)pGzU0;n(X@1fX8wYGKYMpLmCu{N5-}epPDxClPFK#A@02WM3!myN%bkF z|GJ4GZ}3sL{3{qXemy+#Uk{4>Kf8v11;f8I&c76+B&AQ8udd<8gU7+BeWC`akUU~U zgXoxie>MS@rBoyY8O8Tc&8id!w+_ooxcr!1?#rc$-|SBBtH6S?)1e#P#S?jFZ8u-Bs&k`yLqW|{j+%c#A4AQ>+tj$Y z^CZajspu$F%73E68Lw5q7IVREED9r1Ijsg#@DzH>wKseye>hjsk^{n0g?3+gs@7`i zHx+-!sjLx^fS;fY!ERBU+Q zVJ!e0hJH%P)z!y%1^ZyG0>PN@5W~SV%f>}c?$H8r;Sy-ui>aruVTY=bHe}$e zi&Q4&XK!qT7-XjCrDaufT@>ieQ&4G(SShUob0Q>Gznep9fR783jGuUynAqc6$pYX; z7*O@@JW>O6lKIk0G00xsm|=*UVTQBB`u1f=6wGAj%nHK_;Aqmfa!eAykDmi-@u%6~ z;*c!pS1@V8r@IX9j&rW&d*}wpNs96O2Ute>%yt{yv>k!6zfT6pru{F1M3P z2WN1JDYqoTB#(`kE{H676QOoX`cnqHl1Yaru)>8Ky~VU{)r#{&s86Vz5X)v15ULHA zAZDb{99+s~qI6;-dQ5DBjHJP@GYTwn;Dv&9kE<0R!d z8tf1oq$kO`_sV(NHOSbMwr=To4r^X$`sBW4$gWUov|WY?xccQJN}1DOL|GEaD_!@& z15p?Pj+>7d`@LvNIu9*^hPN)pwcv|akvYYq)ks%`G>!+!pW{-iXPZsRp8 z35LR;DhseQKWYSD`%gO&k$Dj6_6q#vjWA}rZcWtQr=Xn*)kJ9kacA=esi*I<)1>w^ zO_+E>QvjP)qiSZg9M|GNeLtO2D7xT6vsj`88sd!94j^AqxFLi}@w9!Y*?nwWARE0P znuI_7A-saQ+%?MFA$gttMV-NAR^#tjl_e{R$N8t2NbOlX373>e7Ox=l=;y#;M7asp zRCz*CLnrm$esvSb5{T<$6CjY zmZ(i{Rs_<#pWW>(HPaaYj`%YqBra=Ey3R21O7vUbzOkJJO?V`4-D*u4$Me0Bx$K(lYo`JO}gnC zx`V}a7m-hLU9Xvb@K2ymioF)vj12<*^oAqRuG_4u%(ah?+go%$kOpfb`T96P+L$4> zQ#S+sA%VbH&mD1k5Ak7^^dZoC>`1L%i>ZXmooA!%GI)b+$D&ziKrb)a=-ds9xk#~& z7)3iem6I|r5+ZrTRe_W861x8JpD`DDIYZNm{$baw+$)X^Jtjnl0xlBgdnNY}x%5za zkQ8E6T<^$sKBPtL4(1zi_Rd(tVth*3Xs!ulflX+70?gb&jRTnI8l+*Aj9{|d%qLZ+ z>~V9Z;)`8-lds*Zgs~z1?Fg?Po7|FDl(Ce<*c^2=lFQ~ahwh6rqSjtM5+$GT>3WZW zj;u~w9xwAhOc<kF}~`CJ68 z?(S5vNJa;kriPlim33{N5`C{9?NWhzsna_~^|K2k4xz1`xcui*LXL-1#Y}Hi9`Oo!zQ>x-kgAX4LrPz63uZ+?uG*84@PKq-KgQlMNRwz=6Yes) zY}>YN+qP}nwr$(CZQFjUOI=-6J$2^XGvC~EZ+vrqWaOXB$k?%Suf5k=4>AveC1aJ! ziaW4IS%F$_Babi)kA8Y&u4F7E%99OPtm=vzw$$ zEz#9rvn`Iot_z-r3MtV>k)YvErZ<^Oa${`2>MYYODSr6?QZu+be-~MBjwPGdMvGd!b!elsdi4% z`37W*8+OGulab8YM?`KjJ8e+jM(tqLKSS@=jimq3)Ea2EB%88L8CaM+aG7;27b?5` z4zuUWBr)f)k2o&xg{iZ$IQkJ+SK>lpq4GEacu~eOW4yNFLU!Kgc{w4&D$4ecm0f}~ zTTzquRW@`f0}|IILl`!1P+;69g^upiPA6F{)U8)muWHzexRenBU$E^9X-uIY2%&1w z_=#5*(nmxJ9zF%styBwivi)?#KMG96-H@hD-H_&EZiRNsfk7mjBq{L%!E;Sqn!mVX*}kXhwH6eh;b42eD!*~upVG@ z#smUqz$ICm!Y8wY53gJeS|Iuard0=;k5i5Z_hSIs6tr)R4n*r*rE`>38Pw&lkv{_r!jNN=;#?WbMj|l>cU(9trCq; z%nN~r^y7!kH^GPOf3R}?dDhO=v^3BeP5hF|%4GNQYBSwz;x({21i4OQY->1G=KFyu z&6d`f2tT9Yl_Z8YACZaJ#v#-(gcyeqXMhYGXb=t>)M@fFa8tHp2x;ODX=Ap@a5I=U z0G80^$N0G4=U(>W%mrrThl0DjyQ-_I>+1Tdd_AuB3qpYAqY54upwa3}owa|x5iQ^1 zEf|iTZxKNGRpI>34EwkIQ2zHDEZ=(J@lRaOH>F|2Z%V_t56Km$PUYu^xA5#5Uj4I4RGqHD56xT%H{+P8Ag>e_3pN$4m8n>i%OyJFPNWaEnJ4McUZPa1QmOh?t8~n& z&RulPCors8wUaqMHECG=IhB(-tU2XvHP6#NrLVyKG%Ee*mQ5Ps%wW?mcnriTVRc4J`2YVM>$ixSF2Xi+Wn(RUZnV?mJ?GRdw%lhZ+t&3s7g!~g{%m&i<6 z5{ib-<==DYG93I(yhyv4jp*y3#*WNuDUf6`vTM%c&hiayf(%=x@4$kJ!W4MtYcE#1 zHM?3xw63;L%x3drtd?jot!8u3qeqctceX3m;tWetK+>~q7Be$h>n6riK(5@ujLgRS zvOym)k+VAtyV^mF)$29Y`nw&ijdg~jYpkx%*^ z8dz`C*g=I?;clyi5|!27e2AuSa$&%UyR(J3W!A=ZgHF9OuKA34I-1U~pyD!KuRkjA zbkN!?MfQOeN>DUPBxoy5IX}@vw`EEB->q!)8fRl_mqUVuRu|C@KD-;yl=yKc=ZT0% zB$fMwcC|HE*0f8+PVlWHi>M`zfsA(NQFET?LrM^pPcw`cK+Mo0%8*x8@65=CS_^$cG{GZQ#xv($7J z??R$P)nPLodI;P!IC3eEYEHh7TV@opr#*)6A-;EU2XuogHvC;;k1aI8asq7ovoP!* z?x%UoPrZjj<&&aWpsbr>J$Er-7!E(BmOyEv!-mbGQGeJm-U2J>74>o5x`1l;)+P&~ z>}f^=Rx(ZQ2bm+YE0u=ZYrAV@apyt=v1wb?R@`i_g64YyAwcOUl=C!i>=Lzb$`tjv zOO-P#A+)t-JbbotGMT}arNhJmmGl-lyUpMn=2UacVZxmiG!s!6H39@~&uVokS zG=5qWhfW-WOI9g4!R$n7!|ViL!|v3G?GN6HR0Pt_L5*>D#FEj5wM1DScz4Jv@Sxnl zB@MPPmdI{(2D?;*wd>3#tjAirmUnQoZrVv`xM3hARuJksF(Q)wd4P$88fGYOT1p6U z`AHSN!`St}}UMBT9o7i|G`r$ zrB=s$qV3d6$W9@?L!pl0lf%)xs%1ko^=QY$ty-57=55PvP(^6E7cc zGJ*>m2=;fOj?F~yBf@K@9qwX0hA803Xw+b0m}+#a(>RyR8}*Y<4b+kpp|OS+!whP( zH`v{%s>jsQI9rd$*vm)EkwOm#W_-rLTHcZRek)>AtF+~<(did)*oR1|&~1|e36d-d zgtm5cv1O0oqgWC%Et@P4Vhm}Ndl(Y#C^MD03g#PH-TFy+7!Osv1z^UWS9@%JhswEq~6kSr2DITo59+; ze=ZC}i2Q?CJ~Iyu?vn|=9iKV>4j8KbxhE4&!@SQ^dVa-gK@YfS9xT(0kpW*EDjYUkoj! zE49{7H&E}k%5(>sM4uGY)Q*&3>{aitqdNnRJkbOmD5Mp5rv-hxzOn80QsG=HJ_atI-EaP69cacR)Uvh{G5dTpYG7d zbtmRMq@Sexey)||UpnZ?;g_KMZq4IDCy5}@u!5&B^-=6yyY{}e4Hh3ee!ZWtL*s?G zxG(A!<9o!CL+q?u_utltPMk+hn?N2@?}xU0KlYg?Jco{Yf@|mSGC<(Zj^yHCvhmyx z?OxOYoxbptDK()tsJ42VzXdINAMWL$0Gcw?G(g8TMB)Khw_|v9`_ql#pRd2i*?CZl z7k1b!jQB=9-V@h%;Cnl7EKi;Y^&NhU0mWEcj8B|3L30Ku#-9389Q+(Yet0r$F=+3p z6AKOMAIi|OHyzlHZtOm73}|ntKtFaXF2Fy|M!gOh^L4^62kGUoWS1i{9gsds_GWBc zLw|TaLP64z3z9?=R2|T6Xh2W4_F*$cq>MtXMOy&=IPIJ`;!Tw?PqvI2b*U1)25^<2 zU_ZPoxg_V0tngA0J+mm?3;OYw{i2Zb4x}NedZug!>EoN3DC{1i)Z{Z4m*(y{ov2%- zk(w>+scOO}MN!exSc`TN)!B=NUX`zThWO~M*ohqq;J2hx9h9}|s#?@eR!=F{QTrq~ zTcY|>azkCe$|Q0XFUdpFT=lTcyW##i;-e{}ORB4D?t@SfqGo_cS z->?^rh$<&n9DL!CF+h?LMZRi)qju!meugvxX*&jfD!^1XB3?E?HnwHP8$;uX{Rvp# zh|)hM>XDv$ZGg=$1{+_bA~u-vXqlw6NH=nkpyWE0u}LQjF-3NhATL@9rRxMnpO%f7 z)EhZf{PF|mKIMFxnC?*78(}{Y)}iztV12}_OXffJ;ta!fcFIVjdchyHxH=t%ci`Xd zX2AUB?%?poD6Zv*&BA!6c5S#|xn~DK01#XvjT!w!;&`lDXSJT4_j$}!qSPrb37vc{ z9^NfC%QvPu@vlxaZ;mIbn-VHA6miwi8qJ~V;pTZkKqqOii<1Cs}0i?uUIss;hM4dKq^1O35y?Yp=l4i zf{M!@QHH~rJ&X~8uATV><23zZUbs-J^3}$IvV_ANLS08>k`Td7aU_S1sLsfi*C-m1 z-e#S%UGs4E!;CeBT@9}aaI)qR-6NU@kvS#0r`g&UWg?fC7|b^_HyCE!8}nyh^~o@< zpm7PDFs9yxp+byMS(JWm$NeL?DNrMCNE!I^ko-*csB+dsf4GAq{=6sfyf4wb>?v1v zmb`F*bN1KUx-`ra1+TJ37bXNP%`-Fd`vVQFTwWpX@;s(%nDQa#oWhgk#mYlY*!d>( zE&!|ySF!mIyfING+#%RDY3IBH_fW$}6~1%!G`suHub1kP@&DoAd5~7J55;5_noPI6eLf{t;@9Kf<{aO0`1WNKd?<)C-|?C?)3s z>wEq@8=I$Wc~Mt$o;g++5qR+(6wt9GI~pyrDJ%c?gPZe)owvy^J2S=+M^ z&WhIE`g;;J^xQLVeCtf7b%Dg#Z2gq9hp_%g)-%_`y*zb; zn9`f`mUPN-Ts&fFo(aNTsXPA|J!TJ{0hZp0^;MYHLOcD=r_~~^ymS8KLCSeU3;^QzJNqS z5{5rEAv#l(X?bvwxpU;2%pQftF`YFgrD1jt2^~Mt^~G>T*}A$yZc@(k9orlCGv&|1 zWWvVgiJsCAtamuAYT~nzs?TQFt<1LSEx!@e0~@yd6$b5!Zm(FpBl;(Cn>2vF?k zOm#TTjFwd2D-CyA!mqR^?#Uwm{NBemP>(pHmM}9;;8`c&+_o3#E5m)JzfwN?(f-a4 zyd%xZc^oQx3XT?vcCqCX&Qrk~nu;fxs@JUoyVoi5fqpi&bUhQ2y!Ok2pzsFR(M(|U zw3E+kH_zmTRQ9dUMZWRE%Zakiwc+lgv7Z%|YO9YxAy`y28`Aw;WU6HXBgU7fl@dnt z-fFBV)}H-gqP!1;V@Je$WcbYre|dRdp{xt!7sL3Eoa%IA`5CAA%;Wq8PktwPdULo! z8!sB}Qt8#jH9Sh}QiUtEPZ6H0b*7qEKGJ%ITZ|vH)5Q^2m<7o3#Z>AKc%z7_u`rXA zqrCy{-{8;9>dfllLu$^M5L z-hXs))h*qz%~ActwkIA(qOVBZl2v4lwbM>9l70Y`+T*elINFqt#>OaVWoja8RMsep z6Or3f=oBnA3vDbn*+HNZP?8LsH2MY)x%c13@(XfuGR}R?Nu<|07{$+Lc3$Uv^I!MQ z>6qWgd-=aG2Y^24g4{Bw9ueOR)(9h`scImD=86dD+MnSN4$6 z^U*o_mE-6Rk~Dp!ANp#5RE9n*LG(Vg`1)g6!(XtDzsov$Dvz|Gv1WU68J$CkshQhS zCrc|cdkW~UK}5NeaWj^F4MSgFM+@fJd{|LLM)}_O<{rj z+?*Lm?owq?IzC%U%9EBga~h-cJbIu=#C}XuWN>OLrc%M@Gu~kFEYUi4EC6l#PR2JS zQUkGKrrS#6H7}2l0F@S11DP`@pih0WRkRJl#F;u{c&ZC{^$Z+_*lB)r)-bPgRFE;* zl)@hK4`tEP=P=il02x7-C7p%l=B`vkYjw?YhdJU9!P!jcmY$OtC^12w?vy3<<=tlY zUwHJ_0lgWN9vf>1%WACBD{UT)1qHQSE2%z|JHvP{#INr13jM}oYv_5#xsnv9`)UAO zuwgyV4YZ;O)eSc3(mka6=aRohi!HH@I#xq7kng?Acdg7S4vDJb6cI5fw?2z%3yR+| zU5v@Hm}vy;${cBp&@D=HQ9j7NcFaOYL zj-wV=eYF{|XTkFNM2uz&T8uH~;)^Zo!=KP)EVyH6s9l1~4m}N%XzPpduPg|h-&lL` zAXspR0YMOKd2yO)eMFFJ4?sQ&!`dF&!|niH*!^*Ml##o0M(0*uK9&yzekFi$+mP9s z>W9d%Jb)PtVi&-Ha!o~Iyh@KRuKpQ@)I~L*d`{O8!kRObjO7=n+Gp36fe!66neh+7 zW*l^0tTKjLLzr`x4`_8&on?mjW-PzheTNox8Hg7Nt@*SbE-%kP2hWYmHu#Fn@Q^J(SsPUz*|EgOoZ6byg3ew88UGdZ>9B2Tq=jF72ZaR=4u%1A6Vm{O#?@dD!(#tmR;eP(Fu z{$0O%=Vmua7=Gjr8nY%>ul?w=FJ76O2js&17W_iq2*tb!i{pt#`qZB#im9Rl>?t?0c zicIC}et_4d+CpVPx)i4~$u6N-QX3H77ez z?ZdvXifFk|*F8~L(W$OWM~r`pSk5}#F?j_5u$Obu9lDWIknO^AGu+Blk7!9Sb;NjS zncZA?qtASdNtzQ>z7N871IsPAk^CC?iIL}+{K|F@BuG2>qQ;_RUYV#>hHO(HUPpk@ z(bn~4|F_jiZi}Sad;_7`#4}EmD<1EiIxa48QjUuR?rC}^HRocq`OQPM@aHVKP9E#q zy%6bmHygCpIddPjE}q_DPC`VH_2m;Eey&ZH)E6xGeStOK7H)#+9y!%-Hm|QF6w#A( zIC0Yw%9j$s-#odxG~C*^MZ?M<+&WJ+@?B_QPUyTg9DJGtQN#NIC&-XddRsf3n^AL6 zT@P|H;PvN;ZpL0iv$bRb7|J{0o!Hq+S>_NrH4@coZtBJu#g8#CbR7|#?6uxi8d+$g z87apN>EciJZ`%Zv2**_uiET9Vk{pny&My;+WfGDw4EVL#B!Wiw&M|A8f1A@ z(yFQS6jfbH{b8Z-S7D2?Ixl`j0{+ZnpT=;KzVMLW{B$`N?Gw^Fl0H6lT61%T2AU**!sX0u?|I(yoy&Xveg7XBL&+>n6jd1##6d>TxE*Vj=8lWiG$4=u{1UbAa5QD>5_ z;Te^42v7K6Mmu4IWT6Rnm>oxrl~b<~^e3vbj-GCdHLIB_>59}Ya+~OF68NiH=?}2o zP(X7EN=quQn&)fK>M&kqF|<_*H`}c zk=+x)GU>{Af#vx&s?`UKUsz})g^Pc&?Ka@t5$n$bqf6{r1>#mWx6Ep>9|A}VmWRnowVo`OyCr^fHsf# zQjQ3Ttp7y#iQY8l`zEUW)(@gGQdt(~rkxlkefskT(t%@i8=|p1Y9Dc5bc+z#n$s13 zGJk|V0+&Ekh(F};PJzQKKo+FG@KV8a<$gmNSD;7rd_nRdc%?9)p!|B-@P~kxQG}~B zi|{0}@}zKC(rlFUYp*dO1RuvPC^DQOkX4<+EwvBAC{IZQdYxoq1Za!MW7%p7gGr=j zzWnAq%)^O2$eItftC#TTSArUyL$U54-O7e|)4_7%Q^2tZ^0-d&3J1}qCzR4dWX!)4 zzIEKjgnYgMus^>6uw4Jm8ga6>GBtMjpNRJ6CP~W=37~||gMo_p@GA@#-3)+cVYnU> zE5=Y4kzl+EbEh%dhQokB{gqNDqx%5*qBusWV%!iprn$S!;oN_6E3?0+umADVs4ako z?P+t?m?};gev9JXQ#Q&KBpzkHPde_CGu-y z<{}RRAx=xlv#mVi+Ibrgx~ujW$h{?zPfhz)Kp7kmYS&_|97b&H&1;J-mzrBWAvY} zh8-I8hl_RK2+nnf&}!W0P+>5?#?7>npshe<1~&l_xqKd0_>dl_^RMRq@-Myz&|TKZBj1=Q()) zF{dBjv5)h=&Z)Aevx}+i|7=R9rG^Di!sa)sZCl&ctX4&LScQ-kMncgO(9o6W6)yd< z@Rk!vkja*X_N3H=BavGoR0@u0<}m-7|2v!0+2h~S2Q&a=lTH91OJsvms2MT~ zY=c@LO5i`mLpBd(vh|)I&^A3TQLtr>w=zoyzTd=^f@TPu&+*2MtqE$Avf>l>}V|3-8Fp2hzo3y<)hr_|NO(&oSD z!vEjTWBxbKTiShVl-U{n*B3#)3a8$`{~Pk}J@elZ=>Pqp|MQ}jrGv7KrNcjW%TN_< zZz8kG{#}XoeWf7qY?D)L)8?Q-b@Na&>i=)(@uNo zr;cH98T3$Iau8Hn*@vXi{A@YehxDE2zX~o+RY`)6-X{8~hMpc#C`|8y> zU8Mnv5A0dNCf{Ims*|l-^ z(MRp{qoGohB34|ggDI*p!Aw|MFyJ|v+<+E3brfrI)|+l3W~CQLPbnF@G0)P~Ly!1TJLp}xh8uW`Q+RB-v`MRYZ9Gam3cM%{ zb4Cb*f)0deR~wtNb*8w-LlIF>kc7DAv>T0D(a3@l`k4TFnrO+g9XH7;nYOHxjc4lq zMmaW6qpgAgy)MckYMhl?>sq;-1E)-1llUneeA!ya9KM$)DaNGu57Z5aE>=VST$#vb zFo=uRHr$0M{-ha>h(D_boS4zId;3B|Tpqo|?B?Z@I?G(?&Iei+-{9L_A9=h=Qfn-U z1wIUnQe9!z%_j$F_{rf&`ZFSott09gY~qrf@g3O=Y>vzAnXCyL!@(BqWa)Zqt!#_k zfZHuwS52|&&)aK;CHq9V-t9qt0au{$#6c*R#e5n3rje0hic7c7m{kW$p(_`wB=Gw7 z4k`1Hi;Mc@yA7dp@r~?@rfw)TkjAW++|pkfOG}0N|2guek}j8Zen(!+@7?qt_7ndX zB=BG6WJ31#F3#Vk3=aQr8T)3`{=p9nBHlKzE0I@v`{vJ}h8pd6vby&VgFhzH|q;=aonunAXL6G2y(X^CtAhWr*jI zGjpY@raZDQkg*aMq}Ni6cRF z{oWv}5`nhSAv>usX}m^GHt`f(t8@zHc?K|y5Zi=4G*UG1Sza{$Dpj%X8 zzEXaKT5N6F5j4J|w#qlZP!zS7BT)9b+!ZSJdToqJts1c!)fwih4d31vfb{}W)EgcA zH2pZ^8_k$9+WD2n`6q5XbOy8>3pcYH9 z07eUB+p}YD@AH!}p!iKv><2QF-Y^&xx^PAc1F13A{nUeCDg&{hnix#FiO!fe(^&%Qcux!h znu*S!s$&nnkeotYsDthh1dq(iQrE|#f_=xVgfiiL&-5eAcC-> z5L0l|DVEM$#ulf{bj+Y~7iD)j<~O8CYM8GW)dQGq)!mck)FqoL^X zwNdZb3->hFrbHFm?hLvut-*uK?zXn3q1z|UX{RZ;-WiLoOjnle!xs+W0-8D)kjU#R z+S|A^HkRg$Ij%N4v~k`jyHffKaC~=wg=9)V5h=|kLQ@;^W!o2^K+xG&2n`XCd>OY5Ydi= zgHH=lgy++erK8&+YeTl7VNyVm9-GfONlSlVb3)V9NW5tT!cJ8d7X)!b-$fb!s76{t z@d=Vg-5K_sqHA@Zx-L_}wVnc@L@GL9_K~Zl(h5@AR#FAiKad8~KeWCo@mgXIQ#~u{ zgYFwNz}2b6Vu@CP0XoqJ+dm8px(5W5-Jpis97F`+KM)TuP*X8H@zwiVKDKGVp59pI zifNHZr|B+PG|7|Y<*tqap0CvG7tbR1R>jn70t1X`XJixiMVcHf%Ez*=xm1(CrTSDt z0cle!+{8*Ja&EOZ4@$qhBuKQ$U95Q%rc7tg$VRhk?3=pE&n+T3upZg^ZJc9~c2es% zh7>+|mrmA-p&v}|OtxqmHIBgUxL~^0+cpfkSK2mhh+4b=^F1Xgd2)}U*Yp+H?ls#z zrLxWg_hm}AfK2XYWr!rzW4g;+^^&bW%LmbtRai9f3PjU${r@n`JThy-cphbcwn)rq9{A$Ht`lmYKxOacy z6v2R(?gHhD5@&kB-Eg?4!hAoD7~(h>(R!s1c1Hx#s9vGPePUR|of32bS`J5U5w{F) z>0<^ktO2UHg<0{oxkdOQ;}coZDQph8p6ruj*_?uqURCMTac;>T#v+l1Tc~%^k-Vd@ zkc5y35jVNc49vZpZx;gG$h{%yslDI%Lqga1&&;mN{Ush1c7p>7e-(zp}6E7f-XmJb4nhk zb8zS+{IVbL$QVF8pf8}~kQ|dHJAEATmmnrb_wLG}-yHe>W|A&Y|;muy-d^t^<&)g5SJfaTH@P1%euONny=mxo+C z4N&w#biWY41r8k~468tvuYVh&XN&d#%QtIf9;iVXfWY)#j=l`&B~lqDT@28+Y!0E+MkfC}}H*#(WKKdJJq=O$vNYCb(ZG@p{fJgu;h z21oHQ(14?LeT>n5)s;uD@5&ohU!@wX8w*lB6i@GEH0pM>YTG+RAIWZD;4#F1&F%Jp zXZUml2sH0!lYJT?&sA!qwez6cXzJEd(1ZC~kT5kZSp7(@=H2$Azb_*W&6aA|9iwCL zdX7Q=42;@dspHDwYE?miGX#L^3xD&%BI&fN9^;`v4OjQXPBaBmOF1;#C)8XA(WFlH zycro;DS2?(G&6wkr6rqC>rqDv3nfGw3hmN_9Al>TgvmGsL8_hXx09};l9Ow@)F5@y z#VH5WigLDwZE4nh^7&@g{1FV^UZ%_LJ-s<{HN*2R$OPg@R~Z`c-ET*2}XB@9xvAjrK&hS=f|R8Gr9 zr|0TGOsI7RD+4+2{ZiwdVD@2zmg~g@^D--YL;6UYGSM8i$NbQr4!c7T9rg!8;TM0E zT#@?&S=t>GQm)*ua|?TLT2ktj#`|R<_*FAkOu2Pz$wEc%-=Y9V*$&dg+wIei3b*O8 z2|m$!jJG!J!ZGbbIa!(Af~oSyZV+~M1qGvelMzPNE_%5?c2>;MeeG2^N?JDKjFYCy z7SbPWH-$cWF9~fX%9~v99L!G(wi!PFp>rB!9xj7=Cv|F+7CsGNwY0Q_J%FID%C^CBZQfJ9K(HK%k31j~e#&?hQ zNuD6gRkVckU)v+53-fc} z7ZCzYN-5RG4H7;>>Hg?LU9&5_aua?A0)0dpew1#MMlu)LHe(M;OHjHIUl7|%%)YPo z0cBk;AOY00%Fe6heoN*$(b<)Cd#^8Iu;-2v@>cE-OB$icUF9EEoaC&q8z9}jMTT2I z8`9;jT%z0;dy4!8U;GW{i`)3!c6&oWY`J3669C!tM<5nQFFrFRglU8f)5Op$GtR-3 zn!+SPCw|04sv?%YZ(a7#L?vsdr7ss@WKAw&A*}-1S|9~cL%uA+E~>N6QklFE>8W|% zyX-qAUGTY1hQ-+um`2|&ji0cY*(qN!zp{YpDO-r>jPk*yuVSay<)cUt`t@&FPF_&$ zcHwu1(SQ`I-l8~vYyUxm@D1UEdFJ$f5Sw^HPH7b!9 zzYT3gKMF((N(v0#4f_jPfVZ=ApN^jQJe-X$`A?X+vWjLn_%31KXE*}5_}d8 zw_B1+a#6T1?>M{ronLbHIlEsMf93muJ7AH5h%;i99<~JX^;EAgEB1uHralD*!aJ@F zV2ruuFe9i2Q1C?^^kmVy921eb=tLDD43@-AgL^rQ3IO9%+vi_&R2^dpr}x{bCVPej z7G0-0o64uyWNtr*loIvslyo0%)KSDDKjfThe0hcqs)(C-MH1>bNGBDRTW~scy_{w} zp^aq8Qb!h9Lwielq%C1b8=?Z=&U)ST&PHbS)8Xzjh2DF?d{iAv)Eh)wsUnf>UtXN( zL7=$%YrZ#|^c{MYmhn!zV#t*(jdmYdCpwqpZ{v&L8KIuKn`@IIZfp!uo}c;7J57N` zAxyZ-uA4=Gzl~Ovycz%MW9ZL7N+nRo&1cfNn9(1H5eM;V_4Z_qVann7F>5f>%{rf= zPBZFaV@_Sobl?Fy&KXyzFDV*FIdhS5`Uc~S^Gjo)aiTHgn#<0C=9o-a-}@}xDor;D zZyZ|fvf;+=3MZd>SR1F^F`RJEZo+|MdyJYQAEauKu%WDol~ayrGU3zzbHKsnHKZ*z zFiwUkL@DZ>!*x05ql&EBq@_Vqv83&?@~q5?lVmffQZ+V-=qL+!u4Xs2Z2zdCQ3U7B&QR9_Iggy} z(om{Y9eU;IPe`+p1ifLx-XWh?wI)xU9ik+m#g&pGdB5Bi<`PR*?92lE0+TkRuXI)z z5LP!N2+tTc%cB6B1F-!fj#}>S!vnpgVU~3!*U1ej^)vjUH4s-bd^%B=ItQqDCGbrEzNQi(dJ`J}-U=2{7-d zK8k^Rlq2N#0G?9&1?HSle2vlkj^KWSBYTwx`2?9TU_DX#J+f+qLiZCqY1TXHFxXZqYMuD@RU$TgcnCC{_(vwZ-*uX)~go#%PK z@}2Km_5aQ~(<3cXeJN6|F8X_1@L%@xTzs}$_*E|a^_URF_qcF;Pfhoe?FTFwvjm1o z8onf@OY@jC2tVcMaZS;|T!Ks(wOgPpRzRnFS-^RZ4E!9dsnj9sFt609a|jJbb1Dt@ z<=Gal2jDEupxUSwWu6zp<<&RnAA;d&4gKVG0iu6g(DsST(4)z6R)zDpfaQ}v{5ARt zyhwvMtF%b-YazR5XLz+oh=mn;y-Mf2a8>7?2v8qX;19y?b>Z5laGHvzH;Nu9S`B8} zI)qN$GbXIQ1VL3lnof^6TS~rvPVg4V?Dl2Bb*K2z4E{5vy<(@@K_cN@U>R!>aUIRnb zL*)=787*cs#zb31zBC49x$`=fkQbMAef)L2$dR{)6BAz!t5U_B#1zZG`^neKSS22oJ#5B=gl%U=WeqL9REF2g zZnfCb0?quf?Ztj$VXvDSWoK`0L=Zxem2q}!XWLoT-kYMOx)!7fcgT35uC~0pySEme z`{wGWTkGr7>+Kb^n;W?BZH6ZP(9tQX%-7zF>vc2}LuWDI(9kh1G#7B99r4x6;_-V+k&c{nPUrR zAXJGRiMe~aup{0qzmLNjS_BC4cB#sXjckx{%_c&^xy{M61xEb>KW_AG5VFXUOjAG4 z^>Qlm9A#1N{4snY=(AmWzatb!ngqiqPbBZ7>Uhb3)dTkSGcL#&SH>iMO-IJBPua`u zo)LWZ>=NZLr758j{%(|uQuZ)pXq_4c!!>s|aDM9#`~1bzK3J1^^D#<2bNCccH7~-X}Ggi!pIIF>uFx%aPARGQsnC8ZQc8lrQ5o~smqOg>Ti^GNme94*w z)JZy{_{#$jxGQ&`M z!OMvZMHR>8*^>eS%o*6hJwn!l8VOOjZQJvh)@tnHVW&*GYPuxqXw}%M!(f-SQf`=L z5;=5w2;%82VMH6Xi&-K3W)o&K^+vJCepWZ-rW%+Dc6X3(){z$@4zjYxQ|}8UIojeC zYZpQ1dU{fy=oTr<4VX?$q)LP}IUmpiez^O&N3E_qPpchGTi5ZM6-2ScWlQq%V&R2Euz zO|Q0Hx>lY1Q1cW5xHv5!0OGU~PVEqSuy#fD72d#O`N!C;o=m+YioGu-wH2k6!t<~K zSr`E=W9)!g==~x9VV~-8{4ZN9{~-A9zJpRe%NGg$+MDuI-dH|b@BD)~>pPCGUNNzY zMDg||0@XGQgw`YCt5C&A{_+J}mvV9Wg{6V%2n#YSRN{AP#PY?1FF1#|vO_%e+#`|2*~wGAJaeRX6=IzFNeWhz6gJc8+(03Ph4y6ELAm=AkN7TOgMUEw*N{= z_)EIDQx5q22oUR+_b*tazu9+pX|n1c*IB-}{DqIj z-?E|ks{o3AGRNb;+iKcHkZvYJvFsW&83RAPs1Oh@IWy%l#5x2oUP6ZCtv+b|q>jsf zZ_9XO;V!>n`UxH1LvH8)L4?8raIvasEhkpQoJ`%!5rBs!0Tu(s_D{`4opB;57)pkX z4$A^8CsD3U5*!|bHIEqsn~{q+Ddj$ME@Gq4JXtgVz&7l{Ok!@?EA{B3P~NAqb9)4? zkQo30A^EbHfQ@87G5&EQTd`frrwL)&Yw?%-W@uy^Gn23%j?Y!Iea2xw<-f;esq zf%w5WN@E1}zyXtYv}}`U^B>W`>XPmdLj%4{P298|SisrE;7HvXX;A}Ffi8B#3Lr;1 zHt6zVb`8{#+e$*k?w8|O{Uh|&AG}|DG1PFo1i?Y*cQm$ZwtGcVgMwtBUDa{~L1KT-{jET4w60>{KZ27vXrHJ;fW{6| z=|Y4!&UX020wU1>1iRgB@Q#m~1^Z^9CG1LqDhYBrnx%IEdIty z!46iOoKlKs)c}newDG)rWUikD%j`)p z_w9Ph&e40=(2eBy;T!}*1p1f1SAUDP9iWy^u^Ubdj21Kn{46;GR+hwLO=4D11@c~V zI8x&(D({K~Df2E)Nx_yQvYfh4;MbMJ@Z}=Dt3_>iim~QZ*hZIlEs0mEb z_54+&*?wMD`2#vsQRN3KvoT>hWofI_Vf(^C1ff-Ike@h@saEf7g}<9T`W;HAne-Nd z>RR+&SP35w)xKn8^U$7))PsM!jKwYZ*RzEcG-OlTrX3}9a{q%#Un5E5W{{hp>w~;` zGky+3(vJvQyGwBo`tCpmo0mo((?nM8vf9aXrrY1Ve}~TuVkB(zeds^jEfI}xGBCM2 zL1|#tycSaWCurP+0MiActG3LCas@_@tao@(R1ANlwB$4K53egNE_;!&(%@Qo$>h`^1S_!hN6 z)vZtG$8fN!|BXBJ=SI>e(LAU(y(i*PHvgQ2llulxS8>qsimv7yL}0q_E5WiAz7)(f zC(ahFvG8&HN9+6^jGyLHM~$)7auppeWh_^zKk&C_MQ~8;N??OlyH~azgz5fe^>~7F zl3HnPN3z-kN)I$4@`CLCMQx3sG~V8hPS^}XDXZrQA>}mQPw%7&!sd(Pp^P=tgp-s^ zjl}1-KRPNWXgV_K^HkP__SR`S-|OF0bR-N5>I%ODj&1JUeAQ3$9i;B~$S6}*^tK?= z**%aCiH7y?xdY?{LgVP}S0HOh%0%LI$wRx;$T|~Y8R)Vdwa}kGWv8?SJVm^>r6+%I z#lj1aR94{@MP;t-scEYQWc#xFA30^}?|BeX*W#9OL;Q9#WqaaM546j5j29((^_8Nu z4uq}ESLr~r*O7E7$D{!k9W>`!SLoyA53i9QwRB{!pHe8um|aDE`Cg0O*{jmor)^t)3`>V>SWN-2VJcFmj^1?~tT=JrP`fVh*t zXHarp=8HEcR#vFe+1a%XXuK+)oFs`GDD}#Z+TJ}Ri`FvKO@ek2ayn}yaOi%(8p%2$ zpEu)v0Jym@f}U|-;}CbR=9{#<^z28PzkkTNvyKvJDZe+^VS2bES3N@Jq!-*}{oQlz z@8bgC_KnDnT4}d#&Cpr!%Yb?E!brx0!eVOw~;lLwUoz#Np%d$o%9scc3&zPm`%G((Le|6o1 zM(VhOw)!f84zG^)tZ1?Egv)d8cdNi+T${=5kV+j;Wf%2{3g@FHp^Gf*qO0q!u$=m9 zCaY`4mRqJ;FTH5`a$affE5dJrk~k`HTP_7nGTY@B9o9vvnbytaID;^b=Tzp7Q#DmD zC(XEN)Ktn39z5|G!wsVNnHi) z%^q94!lL|hF`IijA^9NR0F$@h7k5R^ljOW(;Td9grRN0Mb)l_l7##{2nPQ@?;VjXv zaLZG}yuf$r$<79rVPpXg?6iiieX|r#&`p#Con2i%S8*8F}(E) zI5E6c3tG*<;m~6>!&H!GJ6zEuhH7mkAzovdhLy;)q z{H2*8I^Pb}xC4s^6Y}6bJvMu=8>g&I)7!N!5QG$xseeU#CC?ZM-TbjsHwHgDGrsD= z{%f;@Sod+Ch66Ko2WF~;Ty)v>&x^aovCbCbD7>qF*!?BXmOV3(s|nxsb*Lx_2lpB7 zokUnzrk;P=T-&kUHO}td+Zdj!3n&NR?K~cRU zAXU!DCp?51{J4w^`cV#ye}(`SQhGQkkMu}O3M*BWt4UsC^jCFUy;wTINYmhD$AT;4 z?Xd{HaJjP`raZ39qAm;%beDbrLpbRf(mkKbANan7XsL>_pE2oo^$TgdidjRP!5-`% zv0d!|iKN$c0(T|L0C~XD0aS8t{*&#LnhE;1Kb<9&=c2B+9JeLvJr*AyyRh%@jHej=AetOMSlz^=!kxX>>B{2B1uIrQyfd8KjJ+DBy!h)~*(!|&L4^Q_07SQ~E zcemVP`{9CwFvPFu7pyVGCLhH?LhEVb2{7U+Z_>o25#+3<|8%1T^5dh}*4(kfJGry} zm%r#hU+__Z;;*4fMrX=Bkc@7|v^*B;HAl0((IBPPii%X9+u3DDF6%bI&6?Eu$8&aWVqHIM7mK6?Uvq$1|(-T|)IV<>e?!(rY zqkmO1MRaLeTR=)io(0GVtQT@s6rN%C6;nS3@eu;P#ry4q;^O@1ZKCJyp_Jo)Ty^QW z+vweTx_DLm{P-XSBj~Sl<%_b^$=}odJ!S2wAcxenmzFGX1t&Qp8Vxz2VT`uQsQYtdn&_0xVivIcxZ_hnrRtwq4cZSj1c-SG9 z7vHBCA=fd0O1<4*=lu$6pn~_pVKyL@ztw1swbZi0B?spLo56ZKu5;7ZeUml1Ws1?u zqMf1p{5myAzeX$lAi{jIUqo1g4!zWLMm9cfWcnw`k6*BR^?$2(&yW?>w;G$EmTA@a z6?y#K$C~ZT8+v{87n5Dm&H6Pb_EQ@V0IWmG9cG=O;(;5aMWWrIPzz4Q`mhK;qQp~a z+BbQrEQ+w{SeiuG-~Po5f=^EvlouB@_|4xQXH@A~KgpFHrwu%dwuCR)=B&C(y6J4J zvoGk9;lLs9%iA-IJGU#RgnZZR+@{5lYl8(e1h6&>Vc_mvg0d@);X zji4T|n#lB!>pfL|8tQYkw?U2bD`W{na&;*|znjmalA&f;*U++_aBYerq;&C8Kw7mI z7tsG*?7*5j&dU)Lje;^{D_h`%(dK|pB*A*1(Jj)w^mZ9HB|vGLkF1GEFhu&rH=r=8 zMxO42e{Si6$m+Zj`_mXb&w5Q(i|Yxyg?juUrY}78uo@~3v84|8dfgbPd0iQJRdMj< zncCNGdMEcsxu#o#B5+XD{tsg*;j-eF8`mp~K8O1J!Z0+>0=7O=4M}E?)H)ENE;P*F z$Ox?ril_^p0g7xhDUf(q652l|562VFlC8^r8?lQv;TMvn+*8I}&+hIQYh2 z1}uQQaag&!-+DZ@|C+C$bN6W;S-Z@)d1|en+XGvjbOxCa-qAF*LA=6s(Jg+g;82f$ z(Vb)8I)AH@cdjGFAR5Rqd0wiNCu!xtqWbcTx&5kslzTb^7A78~Xzw1($UV6S^VWiP zFd{Rimd-0CZC_Bu(WxBFW7+k{cOW7DxBBkJdJ;VsJ4Z@lERQr%3eVv&$%)b%<~ zCl^Y4NgO}js@u{|o~KTgH}>!* z_iDNqX2(As7T0xivMH|3SC1ivm8Q}6Ffcd7owUKN5lHAtzMM4<0v+ykUT!QiowO;`@%JGv+K$bBx@*S7C8GJVqQ_K>12}M`f_Ys=S zKFh}HM9#6Izb$Y{wYzItTy+l5U2oL%boCJn?R3?jP@n$zSIwlmyGq30Cw4QBO|14` zW5c);AN*J3&eMFAk$SR~2k|&+&Bc$e>s%c{`?d~85S-UWjA>DS5+;UKZ}5oVa5O(N zqqc@>)nee)+4MUjH?FGv%hm2{IlIF-QX}ym-7ok4Z9{V+ZHVZQl$A*x!(q%<2~iVv znUa+BX35&lCb#9VE-~Y^W_f;Xhl%vgjwdjzMy$FsSIj&ok}L+X`4>J=9BkN&nu^E*gbhj3(+D>C4E z@Fwq_=N)^bKFSHTzZk?-gNU$@l}r}dwGyh_fNi=9b|n}J>&;G!lzilbWF4B}BBq4f zYIOl?b)PSh#XTPp4IS5ZR_2C!E)Z`zH0OW%4;&~z7UAyA-X|sh9@~>cQW^COA9hV4 zXcA6qUo9P{bW1_2`eo6%hgbN%(G-F1xTvq!sc?4wN6Q4`e9Hku zFwvlAcRY?6h^Fj$R8zCNEDq8`=uZB8D-xn)tA<^bFFy}4$vA}Xq0jAsv1&5!h!yRA zU()KLJya5MQ`q&LKdH#fwq&(bNFS{sKlEh_{N%{XCGO+po#(+WCLmKW6&5iOHny>g z3*VFN?mx!16V5{zyuMWDVP8U*|BGT$(%IO|)?EF|OI*sq&RovH!N%=>i_c?K*A>>k zyg1+~++zY4Q)J;VWN0axhoIKx;l&G$gvj(#go^pZskEVj8^}is3Jw26LzYYVos0HX zRPvmK$dVxM8(Tc?pHFe0Z3uq){{#OK3i-ra#@+;*=ui8)y6hsRv z4Fxx1c1+fr!VI{L3DFMwXKrfl#Q8hfP@ajgEau&QMCxd{g#!T^;ATXW)nUg&$-n25 zruy3V!!;{?OTobo|0GAxe`Acn3GV@W=&n;~&9 zQM>NWW~R@OYORkJAo+eq1!4vzmf9K%plR4(tB@TR&FSbDoRgJ8qVcH#;7lQub*nq&?Z>7WM=oeEVjkaG zT#f)=o!M2DO5hLR+op>t0CixJCIeXH*+z{-XS|%jx)y(j&}Wo|3!l7{o)HU3m7LYyhv*xF&tq z%IN7N;D4raue&&hm0xM=`qv`+TK@;_xAcGKuK(2|75~ar2Yw)geNLSmVxV@x89bQu zpViVKKnlkwjS&&c|-X6`~xdnh}Ps)Hs z4VbUL^{XNLf7_|Oi>tA%?SG5zax}esF*FH3d(JH^Gvr7Rp*n=t7frH!U;!y1gJB^i zY_M$KL_}mW&XKaDEi9K-wZR|q*L32&m+2n_8lq$xRznJ7p8}V>w+d@?uB!eS3#u<} zIaqi!b!w}a2;_BfUUhGMy#4dPx>)_>yZ`ai?Rk`}d0>~ce-PfY-b?Csd(28yX22L% zI7XI>OjIHYTk_@Xk;Gu^F52^Gn6E1&+?4MxDS2G_#PQ&yXPXP^<-p|2nLTb@AAQEY zI*UQ9Pmm{Kat}wuazpjSyXCdnrD&|C1c5DIb1TnzF}f4KIV6D)CJ!?&l&{T)e4U%3HTSYqsQ zo@zWB1o}ceQSV)<4G<)jM|@@YpL+XHuWsr5AYh^Q{K=wSV99D~4RRU52FufmMBMmd z_H}L#qe(}|I9ZyPRD6kT>Ivj&2Y?qVZq<4bG_co_DP`sE*_Xw8D;+7QR$Uq(rr+u> z8bHUWbV19i#)@@G4bCco@Xb<8u~wVDz9S`#k@ciJtlu@uP1U0X?yov8v9U3VOig2t zL9?n$P3=1U_Emi$#slR>N5wH-=J&T=EdUHA}_Z zZIl3nvMP*AZS9{cDqFanrA~S5BqxtNm9tlu;^`)3X&V4tMAkJ4gEIPl= zoV!Gyx0N{3DpD@)pv^iS*dl2FwANu;1;%EDl}JQ7MbxLMAp>)UwNwe{=V}O-5C*>F zu?Ny+F64jZn<+fKjF01}8h5H_3pey|;%bI;SFg$w8;IC<8l|3#Lz2;mNNik6sVTG3 z+Su^rIE#40C4a-587$U~%KedEEw1%r6wdvoMwpmlXH$xPnNQN#f%Z7|p)nC>WsuO= z4zyqapLS<8(UJ~Qi9d|dQijb_xhA2)v>la)<1md5s^R1N&PiuA$^k|A<+2C?OiHbj z>Bn$~t)>Y(Zb`8hW7q9xQ=s>Rv81V+UiuZJc<23HplI88isqRCId89fb`Kt|CxVIg znWcwprwXnotO>3s&Oypkte^9yJjlUVVxSe%_xlzmje|mYOVPH^vjA=?6xd0vaj0Oz zwJ4OJNiFdnHJX3rw&inskjryukl`*fRQ#SMod5J|KroJRsVXa5_$q7whSQ{gOi*s0 z1LeCy|JBWRsDPn7jCb4s(p|JZiZ8+*ExC@Vj)MF|*Vp{B(ziccSn`G1Br9bV(v!C2 z6#?eqpJBc9o@lJ#^p-`-=`4i&wFe>2)nlPK1p9yPFzJCzBQbpkcR>={YtamIw)3nt z(QEF;+)4`>8^_LU)_Q3 zC5_7lgi_6y>U%m)m@}Ku4C}=l^J=<<7c;99ec3p{aR+v=diuJR7uZi%aQv$oP?dn?@6Yu_+*^>T0ptf(oobdL;6)N-I!TO`zg^Xbv3#L0I~sn@WGk-^SmPh5>W+LB<+1PU}AKa?FCWF|qMNELOgdxR{ zbqE7@jVe+FklzdcD$!(A$&}}H*HQFTJ+AOrJYnhh}Yvta(B zQ_bW4Rr;R~&6PAKwgLWXS{Bnln(vUI+~g#kl{r+_zbngT`Y3`^Qf=!PxN4IYX#iW4 zucW7@LLJA9Zh3(rj~&SyN_pjO8H&)|(v%!BnMWySBJV=eSkB3YSTCyIeJ{i;(oc%_hk{$_l;v>nWSB)oVeg+blh=HB5JSlG_r7@P z3q;aFoZjD_qS@zygYqCn=;Zxjo!?NK!%J$ z52lOP`8G3feEj+HTp@Tnn9X~nG=;tS+z}u{mQX_J0kxtr)O30YD%oo)L@wy`jpQYM z@M>Me=95k1p*FW~rHiV1CIfVc{K8r|#Kt(ApkXKsDG$_>76UGNhHExFCw#Ky9*B-z zNq2ga*xax!HMf_|Vp-86r{;~YgQKqu7%szk8$hpvi_2I`OVbG1doP(`gn}=W<8%Gn z%81#&WjkH4GV;4u43EtSW>K_Ta3Zj!XF?;SO3V#q=<=>Tc^@?A`i;&`-cYj|;^ zEo#Jl5zSr~_V-4}y8pnufXLa80vZY4z2ko7fj>DR)#z=wWuS1$$W!L?(y}YC+yQ|G z@L&`2upy3f>~*IquAjkVNU>}c10(fq#HdbK$~Q3l6|=@-eBbo>B9(6xV`*)sae58*f zym~RRVx;xoCG3`JV`xo z!lFw)=t2Hy)e!IFs?0~7osWk(d%^wxq&>_XD4+U#y&-VF%4z?XH^i4w`TxpF{`XhZ z%G}iEzf!T(l>g;W9<~K+)$g!{UvhW{E0Lis(S^%I8OF&%kr!gJ&fMOpM=&=Aj@wuL zBX?*6i51Qb$uhkwkFYkaD_UDE+)rh1c;(&Y=B$3)J&iJfQSx!1NGgPtK!$c9OtJuu zX(pV$bfuJpRR|K(dp@^j}i&HeJOh@|7lWo8^$*o~Xqo z5Sb+!EtJ&e@6F+h&+_1ETbg7LfP5GZjvIUIN3ibCOldAv z)>YdO|NH$x7AC8dr=<2ekiY1%fN*r~e5h6Yaw<{XIErujKV~tiyrvV_DV0AzEknC- zR^xKM3i<1UkvqBj3C{wDvytOd+YtDSGu!gEMg+!&|8BQrT*|p)(dwQLEy+ zMtMzij3zo40)CA!BKZF~yWg?#lWhqD3@qR)gh~D{uZaJO;{OWV8XZ_)J@r3=)T|kt zUS1pXr6-`!Z}w2QR7nP%d?ecf90;K_7C3d!UZ`N(TZoWNN^Q~RjVhQG{Y<%E1PpV^4 z-m-K+$A~-+VDABs^Q@U*)YvhY4Znn2^w>732H?NRK(5QSS$V@D7yz2BVX4)f5A04~$WbxGOam22>t&uD)JB8-~yiQW6ik;FGblY_I>SvB_z2?PS z*Qm&qbKI{H1V@YGWzpx`!v)WeLT02};JJo*#f$a*FH?IIad-^(;9XC#YTWN6;Z6+S zm4O1KH=#V@FJw7Pha0!9Vb%ZIM$)a`VRMoiN&C|$YA3~ZC*8ayZRY^fyuP6$n%2IU z$#XceYZeqLTXw(m$_z|33I$B4k~NZO>pP6)H_}R{E$i%USGy{l{-jOE;%CloYPEU+ zRFxOn4;7lIOh!7abb23YKD+_-?O z0FP9otcAh+oSj;=f#$&*ExUHpd&e#bSF%#8*&ItcL2H$Sa)?pt0Xtf+t)z$_u^wZi z44oE}r4kIZGy3!Mc8q$B&6JqtnHZ>Znn!Zh@6rgIu|yU+zG8q`q9%B18|T|oN3zMq z`l&D;U!OL~%>vo&q0>Y==~zLiCZk4v%s_7!9DxQ~id1LLE93gf*gg&2$|hB#j8;?3 z5v4S;oM6rT{Y;I+#FdmNw z){d%tNM<<#GN%n9ox7B=3#;u7unZ~tLB_vRZ52a&2=IM)2VkXm=L+Iqq~uk#Dug|x z>S84e+A7EiOY5lj*!q?6HDkNh~0g;0Jy(al!ZHHDtur9T$y-~)94HelX1NHjXWIM7UAe}$?jiz z9?P4`I0JM=G5K{3_%2jPLC^_Mlw?-kYYgb7`qGa3@dn|^1fRMwiyM@Ch z;CB&o7&&?c5e>h`IM;Wnha0QKnEp=$hA8TJgR-07N~U5(>9vJzeoFsSRBkDq=x(YgEMpb=l4TDD`2 zwVJpWGTA_u7}?ecW7s6%rUs&NXD3+n;jB86`X?8(l3MBo6)PdakI6V6a}22{)8ilT zM~T*mU}__xSy|6XSrJ^%lDAR3Lft%+yxC|ZUvSO_nqMX!_ul3;R#*{~4DA=h$bP)%8Yv9X zyp><|e8=_ttI}ZAwOd#dlnSjck#6%273{E$kJuCGu=I@O)&6ID{nWF5@gLb16sj|&Sb~+du4e4O_%_o`Ix4NRrAsyr1_}MuP94s>de8cH-OUkVPk3+K z&jW)It9QiU-ti~AuJkL`XMca8Oh4$SyJ=`-5WU<{cIh+XVH#e4d&zive_UHC!pN>W z3TB;Mn5i)9Qn)#6@lo4QpI3jFYc0~+jS)4AFz8fVC;lD^+idw^S~Qhq>Tg(!3$yLD zzktzoFrU@6s4wwCMz}edpF5i5Q1IMmEJQHzp(LAt)pgN3&O!&d?3W@6U4)I^2V{;- z6A(?zd93hS*uQmnh4T)nHnE{wVhh(=MMD(h(P4+^p83Om6t<*cUW>l(qJzr%5vp@K zN27ka(L{JX=1~e2^)F^i=TYj&;<7jyUUR2Bek^A8+3Up*&Xwc{)1nRR5CT8vG>ExV zHnF3UqXJOAno_?bnhCX-&kwI~Ti8t4`n0%Up>!U`ZvK^w2+0Cs-b9%w%4`$+To|k= zKtgc&l}P`*8IS>8DOe?EB84^kx4BQp3<7P{Pq}&p%xF_81pg!l2|u=&I{AuUgmF5n zJQCTLv}%}xbFGYtKfbba{CBo)lWW%Z>i(_NvLhoQZ*5-@2l&x>e+I~0Nld3UI9tdL zRzu8}i;X!h8LHVvN?C+|M81e>Jr38%&*9LYQec9Ax>?NN+9(_>XSRv&6hlCYB`>Qm z1&ygi{Y()OU4@D_jd_-7vDILR{>o|7-k)Sjdxkjgvi{@S>6GqiF|o`*Otr;P)kLHN zZkpts;0zw_6;?f(@4S1FN=m!4^mv~W+lJA`&7RH%2$)49z0A+8@0BCHtj|yH--AEL z0tW6G%X-+J+5a{5*WKaM0QDznf;V?L5&uQw+yegDNDP`hA;0XPYc6e0;Xv6|i|^F2WB)Z$LR|HR4 zTQsRAby9(^Z@yATyOgcfQw7cKyr^3Tz7lc7+JEwwzA7)|2x+PtEb>nD(tpxJQm)Kn zW9K_*r!L%~N*vS8<5T=iv|o!zTe9k_2jC_j*7ik^M_ zaf%k{WX{-;0*`t`G!&`eW;gChVXnJ-Rn)To8vW-?>>a%QU1v`ZC=U)f8iA@%JG0mZ zDqH;~mgBnrCP~1II<=V9;EBL)J+xzCoiRBaeH&J6rL!{4zIY8tZka?_FBeQeNO3q6 zyG_alW54Ba&wQf{&F1v-r1R6ID)PTsqjIBc+5MHkcW5Fnvi~{-FjKe)t1bl}Y;z@< z=!%zvpRua>>t_x}^}z0<7MI!H2v6|XAyR9!t50q-A)xk0nflgF4*OQlCGK==4S|wc zRMsSscNhRzHMBU8TdcHN!q^I}x0iXJ%uehac|Zs_B$p@CnF)HeXPpB_Za}F{<@6-4 zl%kml@}kHQ(ypD8FsPJ2=14xXJE|b20RUIgs!2|R3>LUMGF6X*B_I|$`Qg=;zm7C z{mEDy9dTmPbued7mlO@phdmAmJ7p@GR1bjCkMw6*G7#4+`k>fk1czdJUB!e@Q(~6# zwo%@p@V5RL0ABU2LH7Asq^quDUho@H>eTZH9f*no9fY0T zD_-9px3e}A!>>kv5wk91%C9R1J_Nh!*&Kk$J3KNxC}c_@zlgpJZ+5L)Nw|^p=2ue}CJtm;uj*Iqr)K})kA$xtNUEvX;4!Px*^&9T_`IN{D z{6~QY=Nau6EzpvufB^hflc#XIsSq0Y9(nf$d~6ZwK}fal92)fr%T3=q{0mP-EyP_G z)UR5h@IX}3Qll2b0oCAcBF>b*@Etu*aTLPU<%C>KoOrk=x?pN!#f_Og-w+;xbFgjQ zXp`et%lDBBh~OcFnMKMUoox0YwBNy`N0q~bSPh@+enQ=4RUw1) zpovN`QoV>vZ#5LvC;cl|6jPr}O5tu!Ipoyib8iXqy}TeJ;4+_7r<1kV0v5?Kv>fYp zg>9L`;XwXa&W7-jf|9~uP2iyF5`5AJ`Q~p4eBU$MCC00`rcSF>`&0fbd^_eqR+}mK z4n*PMMa&FOcc)vTUR zlDUAn-mh`ahi_`f`=39JYTNVjsTa_Y3b1GOIi)6dY)D}xeshB0T8Eov5%UhWd1)u}kjEQ|LDo{tqKKrYIfVz~@dp!! zMOnah@vp)%_-jDTUG09l+;{CkDCH|Q{NqX*uHa1YxFShy*1+;J`gywKaz|2Q{lG8x zP?KBur`}r`!WLKXY_K;C8$EWG>jY3UIh{+BLv0=2)KH%P}6xE2kg)%(-uA6lC?u8}{K(#P*c zE9C8t*u%j2r_{;Rpe1A{9nNXU;b_N0vNgyK!EZVut~}+R2rcbsHilqsOviYh-pYX= zHw@53nlmwYI5W5KP>&`dBZe0Jn?nAdC^HY1wlR6$u^PbpB#AS&5L6zqrXN&7*N2Q` z+Rae1EwS)H=aVSIkr8Ek^1jy2iS2o7mqm~Mr&g5=jjt7VxwglQ^`h#Mx+x2v|9ZAwE$i_9918MjJxTMr?n!bZ6n$}y11u8I9COTU`Z$Fi z!AeAQLMw^gp_{+0QTEJrhL424pVDp%wpku~XRlD3iv{vQ!lAf!_jyqd_h}+Tr1XG| z`*FT*NbPqvHCUsYAkFnM`@l4u_QH&bszpUK#M~XLJt{%?00GXY?u_{gj3Hvs!=N(I z(=AuWPijyoU!r?aFTsa8pLB&cx}$*%;K$e*XqF{~*rA-qn)h^!(-;e}O#B$|S~c+U zN4vyOK0vmtx$5K!?g*+J@G1NmlEI=pyZXZ69tAv=@`t%ag_Hk{LP~OH9iE)I= zaJ69b4kuCkV0V zo(M0#>phpQ_)@j;h%m{-a*LGi(72TP)ws2w*@4|C-3+;=5DmC4s7Lp95%n%@Ko zfdr3-a7m*dys9iIci$A=4NPJ`HfJ;hujLgU)ZRuJI`n;Pw|yksu!#LQnJ#dJysgNb z@@qwR^wrk(jbq4H?d!lNyy72~Dnn87KxsgQ!)|*m(DRM+eC$wh7KnS-mho3|KE)7h zK3k;qZ;K1Lj6uEXLYUYi)1FN}F@-xJ z@@3Hb84sl|j{4$3J}aTY@cbX@pzB_qM~APljrjju6P0tY{C@ zpUCOz_NFmALMv1*blCcwUD3?U6tYs+N%cmJ98D%3)%)Xu^uvzF zS5O!sc#X6?EwsYkvPo6A%O8&y8sCCQH<%f2togVwW&{M;PR!a(ZT_A+jVAbf{@5kL zB@Z(hb$3U{T_}SKA_CoQVU-;j>2J=L#lZ~aQCFg-d<9rzs$_gO&d5N6eFSc z1ml8)P*FSi+k@!^M9nDWR5e@ATD8oxtDu=36Iv2!;dZzidIS(PCtEuXAtlBb1;H%Z zwnC^Ek*D)EX4#Q>R$$WA2sxC_t(!!6Tr?C#@{3}n{<^o;9id1RA&-Pig1e-2B1XpG zliNjgmd3c&%A}s>qf{_j#!Z`fu0xIwm4L0)OF=u(OEmp;bLCIaZX$&J_^Z%4Sq4GZ zPn6sV_#+6pJmDN_lx@1;Zw6Md_p0w9h6mHtzpuIEwNn>OnuRSC2=>fP^Hqgc)xu^4 z<3!s`cORHJh#?!nKI`Et7{3C27+EuH)Gw1f)aoP|B3y?fuVfvpYYmmukx0ya-)TQX zR{ggy5cNf4X|g)nl#jC9p>7|09_S7>1D2GTRBUTW zAkQ=JMRogZqG#v;^=11O6@rPPwvJkr{bW-Qg8`q8GoD#K`&Y+S#%&B>SGRL>;ZunM@49!}Uy zN|bBCJ%sO;@3wl0>0gbl3L@1^O60ONObz8ZI7nder>(udj-jt`;yj^nTQ$L9`OU9W zX4alF#$|GiR47%x@s&LV>2Sz2R6?;2R~5k6V>)nz!o_*1Y!$p>BC5&?hJg_MiE6UBy>RkVZj`9UWbRkN-Hk!S`=BS3t3uyX6)7SF#)71*}`~Ogz z1rap5H6~dhBJ83;q-Y<5V35C2&F^JI-it(=5D#v!fAi9p#UwV~2tZQI+W(Dv?1t9? zfh*xpxxO{-(VGB>!Q&0%^YW_F!@aZS#ucP|YaD#>wd1Fv&Z*SR&mc;asi}1G) z_H>`!akh-Zxq9#io(7%;a$)w+{QH)Y$?UK1Dt^4)up!Szcxnu}kn$0afcfJL#IL+S z5gF_Y30j;{lNrG6m~$Ay?)*V9fZuU@3=kd40=LhazjFrau>(Y>SJNtOz>8x_X-BlA zIpl{i>OarVGj1v(4?^1`R}aQB&WCRQzS~;7R{tDZG=HhgrW@B`W|#cdyj%YBky)P= zpxuOZkW>S6%q7U{VsB#G(^FMsH5QuGXhb(sY+!-R8Bmv6Sx3WzSW<1MPPN1!&PurYky(@`bP9tz z52}LH9Q?+FF5jR6-;|+GVdRA!qtd;}*-h&iIw3Tq3qF9sDIb1FFxGbo&fbG5n8$3F zyY&PWL{ys^dTO}oZ#@sIX^BKW*bon=;te9j5k+T%wJ zNJtoN1~YVj4~YRrlZl)b&kJqp+Z`DqT!la$x&&IxgOQw#yZd-nBP3!7FijBXD|IsU8Zl^ zc6?MKpJQ+7ka|tZQLfchD$PD|;K(9FiLE|eUZX#EZxhG!S-63C$jWX1Yd!6-Yxi-u zjULIr|0-Q%D9jz}IF~S%>0(jOqZ(Ln<$9PxiySr&2Oic7vb<8q=46)Ln%Z|<*z5&> z3f~Zw@m;vR(bESB<=Jqkxn(=#hQw42l(7)h`vMQQTttz9XW6^|^8EK7qhju4r_c*b zJIi`)MB$w@9epwdIfnEBR+?~);yd6C(LeMC& zn&&N*?-g&BBJcV;8&UoZi4Lmxcj16ojlxR~zMrf=O_^i1wGb9X-0@6_rpjPYemIin zmJb+;lHe;Yp=8G)Q(L1bzH*}I>}uAqhj4;g)PlvD9_e_ScR{Ipq|$8NvAvLD8MYr}xl=bU~)f%B3E>r3Bu9_t|ThF3C5~BdOve zEbk^r&r#PT&?^V1cb{72yEWH}TXEE}w>t!cY~rA+hNOTK8FAtIEoszp!qqptS&;r$ zaYV-NX96-h$6aR@1xz6_E0^N49mU)-v#bwtGJm)ibygzJ8!7|WIrcb`$XH~^!a#s& z{Db-0IOTFq#9!^j!n_F}#Z_nX{YzBK8XLPVmc&X`fT7!@$U-@2KM9soGbmOSAmqV z{nr$L^MBo_u^Joyf0E^=eo{Rt0{{e$IFA(#*kP@SQd6lWT2-#>` zP1)7_@IO!9lk>Zt?#CU?cuhiLF&)+XEM9B)cS(gvQT!X3`wL*{fArTS;Ak`J<84du zALKPz4}3nlG8Fo^MH0L|oK2-4xIY!~Oux~1sw!+It)&D3p;+N8AgqKI`ld6v71wy8I!eP0o~=RVcFQR2Gr(eP_JbSytoQ$Yt}l*4r@A8Me94y z8cTDWhqlq^qoAhbOzGBXv^Wa4vUz$(7B!mX`T=x_ueKRRDfg&Uc-e1+z4x$jyW_Pm zp?U;-R#xt^Z8Ev~`m`iL4*c#65Nn)q#=Y0l1AuD&+{|8-Gsij3LUZXpM0Bx0u7WWm zH|%yE@-#XEph2}-$-thl+S;__ciBxSSzHveP%~v}5I%u!z_l_KoW{KRx2=eB33umE zIYFtu^5=wGU`Jab8#}cnYry@9p5UE#U|VVvx_4l49JQ;jQdp(uw=$^A$EA$LM%vmE zvdEOaIcp5qX8wX{mYf0;#51~imYYPn4=k&#DsKTxo{_Mg*;S495?OBY?#gv=edYC* z^O@-sd-qa+U24xvcbL0@C7_6o!$`)sVr-jSJE4XQUQ$?L7}2(}Eixqv;L8AdJAVqc zq}RPgpnDb@E_;?6K58r3h4-!4rT4Ab#rLHLX?eMOfluJk=3i1@Gt1i#iA=O`M0@x! z(HtJP9BMHXEzuD93m|B&woj0g6T?f#^)>J>|I4C5?Gam>n9!8CT%~aT;=oco5d6U8 zMXl(=W;$ND_8+DD*?|5bJ!;8ebESXMUKBAf7YBwNVJibGaJ*(2G`F%wx)grqVPjudiaq^Kl&g$8A2 zWMxMr@_$c}d+;_B`#kUX-t|4VKH&_f^^EP0&=DPLW)H)UzBG%%Tra*5 z%$kyZe3I&S#gfie^z5)!twG={3Cuh)FdeA!Kj<-9** zvT*5%Tb`|QbE!iW-XcOuy39>D3oe6x{>&<#E$o8Ac|j)wq#kQzz|ATd=Z0K!p2$QE zPu?jL8Lb^y3_CQE{*}sTDe!2!dtlFjq&YLY@2#4>XS`}v#PLrpvc4*@q^O{mmnr5D zmyJq~t?8>FWU5vZdE(%4cuZuao0GNjp3~Dt*SLaxI#g_u>hu@k&9Ho*#CZP~lFJHj z(e!SYlLigyc?&5-YxlE{uuk$9b&l6d`uIlpg_z15dPo*iU&|Khx2*A5Fp;8iK_bdP z?T6|^7@lcx2j0T@x>X7|kuuBSB7<^zeY~R~4McconTxA2flHC0_jFxmSTv-~?zVT| zG_|yDqa9lkF*B6_{j=T>=M8r<0s;@z#h)3BQ4NLl@`Xr__o7;~M&dL3J8fP&zLfDfy z);ckcTev{@OUlZ`bCo(-3? z1u1xD`PKgSg?RqeVVsF<1SLF;XYA@Bsa&cY!I48ZJn1V<3d!?s=St?TLo zC0cNr`qD*M#s6f~X>SCNVkva^9A2ZP>CoJ9bvgXe_c}WdX-)pHM5m7O zrHt#g$F0AO+nGA;7dSJ?)|Mo~cf{z2L)Rz!`fpi73Zv)H=a5K)*$5sf_IZypi($P5 zsPwUc4~P-J1@^3C6-r9{V-u0Z&Sl7vNfmuMY4yy*cL>_)BmQF!8Om9Dej%cHxbIzA zhtV0d{=%cr?;bpBPjt@4w=#<>k5ee=TiWAXM2~tUGfm z$s&!Dm0R^V$}fOR*B^kGaipi~rx~A2cS0;t&khV1a4u38*XRUP~f za!rZMtay8bsLt6yFYl@>-y^31(*P!L^^s@mslZy(SMsv9bVoX`O#yBgEcjCmGpyc* zeH$Dw6vB5P*;jor+JOX@;6K#+xc)Z9B8M=x2a@Wx-{snPGpRmOC$zpsqW*JCh@M2Y z#K+M(>=#d^>Of9C`))h<=Bsy)6zaMJ&x-t%&+UcpLjV`jo4R2025 zXaG8EA!0lQa)|dx-@{O)qP6`$rhCkoQqZ`^SW8g-kOwrwsK8 z3ms*AIcyj}-1x&A&vSq{r=QMyp3CHdWH35!sad#!Sm>^|-|afB+Q;|Iq@LFgqIp#Z zD1%H+3I?6RGnk&IFo|u+E0dCxXz4yI^1i!QTu7uvIEH>i3rR{srcST`LIRwdV1P;W z+%AN1NIf@xxvVLiSX`8ILA8MzNqE&7>%jMzGt9wm78bo9<;h*W84i29^w!>V>{N+S zd`5Zmz^G;f=icvoOZfK5#1ctx*~UwD=ab4DGQXehQ!XYnak*dee%YN$_ZPL%KZuz$ zD;$PpT;HM^$KwtQm@7uvT`i6>Hae1CoRVM2)NL<2-k2PiX=eAx+-6j#JI?M}(tuBW zkF%jjLR)O`gI2fcPBxF^HeI|DWwQWHVR!;;{BXXHskxh8F@BMDn`oEi-NHt;CLymW z=KSv5)3dyzec0T5B*`g-MQ<;gz=nIWKUi9ko<|4I(-E0k$QncH>E4l z**1w&#={&zv4Tvhgz#c29`m|;lU-jmaXFMC11 z*dlXDMEOG>VoLMc>!rApwOu2prKSi*!w%`yzGmS+k(zm*CsLK*wv{S_0WX^8A-rKy zbk^Gf_92^7iB_uUF)EE+ET4d|X|>d&mdN?x@vxKAQk`O+r4Qdu>XGy(a(19g;=jU} zFX{O*_NG>!$@jh!U369Lnc+D~qch3uT+_Amyi}*k#LAAwh}k8IPK5a-WZ81ufD>l> z$4cF}GSz>ce`3FAic}6W4Z7m9KGO?(eWqi@L|5Hq0@L|&2flN1PVl}XgQ2q*_n2s3 zt5KtowNkTYB5b;SVuoXA@i5irXO)A&%7?V`1@HGCB&)Wgk+l|^XXChq;u(nyPB}b3 zY>m5jkxpZgi)zfbgv&ec4Zqdvm+D<?Im*mXweS9H+V>)zF#Zp3)bhl$PbISY{5=_z!8&*Jv~NYtI-g!>fDs zmvL5O^U%!^VaKA9gvKw|5?-jk>~%CVGvctKmP$kpnpfN{D8@X*Aazi$txfa%vd-|E z>kYmV66W!lNekJPom29LdZ%(I+ZLZYTXzTg*to~m?7vp%{V<~>H+2}PQ?PPAq`36R z<%wR8v6UkS>Wt#hzGk#44W<%9S=nBfB);6clKwnxY}T*w21Qc3_?IJ@4gYzC7s;WP zVQNI(M=S=JT#xsZy7G`cR(BP9*je0bfeN8JN5~zY(DDs0t{LpHOIbN);?T-69Pf3R zSNe*&p2%AwXHL>__g+xd4Hlc_vu<25H?(`nafS%)3UPP7_4;gk-9ckt8SJRTv5v0M z_Hww`qPudL?ajIR&X*;$y-`<)6dxx1U~5eGS13CB!lX;3w7n&lDDiArbAhSycd}+b zya_3p@A`$kQy;|NJZ~s44Hqo7Hwt}X86NK=(ey>lgWTtGL6k@Gy;PbO!M%1~Wcn2k zUFP|*5d>t-X*RU8g%>|(wwj*~#l4z^Aatf^DWd1Wj#Q*AY0D^V@sC`M zjJc6qXu0I7Y*2;;gGu!plAFzG=J;1%eIOdn zQA>J&e05UN*7I5@yRhK|lbBSfJ+5Uq;!&HV@xfPZrgD}kE*1DSq^=%{o%|LChhl#0 zlMb<^a6ixzpd{kNZr|3jTGeEzuo}-eLT-)Q$#b{!vKx8Tg}swCni>{#%vDY$Ww$84 zew3c9BBovqb}_&BRo#^!G(1Eg((BScRZ}C)Oz?y`T5wOrv);)b^4XR8 zhJo7+<^7)qB>I;46!GySzdneZ>n_E1oWZY;kf94#)s)kWjuJN1c+wbVoNQcmnv}{> zN0pF+Sl3E}UQ$}slSZeLJrwT>Sr}#V(dVaezCQl2|4LN`7L7v&siYR|r7M(*JYfR$ zst3=YaDw$FSc{g}KHO&QiKxuhEzF{f%RJLKe3p*7=oo`WNP)M(9X1zIQPP0XHhY3c znrP{$4#Ol$A0s|4S7Gx2L23dv*Gv2o;h((XVn+9+$qvm}s%zi6nI-_s6?mG! zj{DV;qesJb&owKeEK?=J>UcAlYckA7Sl+I&IN=yasrZOkejir*kE@SN`fk<8Fgx*$ zy&fE6?}G)d_N`){P~U@1jRVA|2*69)KSe_}!~?+`Yb{Y=O~_+@!j<&oVQQMnhoIRU zA0CyF1OFfkK44n*JD~!2!SCPM;PRSk%1XL=0&rz00wxPs&-_eapJy#$h!eqY%nS0{ z!aGg58JIJPF3_ci%n)QSVpa2H`vIe$RD43;#IRfDV&Ibit z+?>HW4{2wOfC6Fw)}4x}i1maDxcE1qi@BS*qcxD2gE@h3#4cgU*D-&3z7D|tVZWt= z-Cy2+*Cm@P4GN_TPUtaVyVesbVDazF@)j8VJ4>XZv!f%}&eO1SvIgr}4`A*3#vat< z_MoByL(qW6L7SFZ#|Gc1fFN)L2PxY+{B8tJp+pxRyz*87)vXR}*=&ahXjBlQKguuf zX6x<<6fQulE^C*KH8~W%ptpaC0l?b=_{~*U4?5Vt;dgM4t_{&UZ1C2j?b>b+5}{IF_CUyvz-@QZPMlJ)r_tS$9kH%RPv#2_nMb zRLj5;chJ72*U`Z@Dqt4$@_+k$%|8m(HqLG!qT4P^DdfvGf&){gKnGCX#H0!;W=AGP zbA&Z`-__a)VTS}kKFjWGk z%|>yE?t*EJ!qeQ%dPk$;xIQ+P0;()PCBDgjJm6Buj{f^awNoVx+9<|lg3%-$G(*f) zll6oOkN|yamn1uyl2*N-lnqRI1cvs_JxLTeahEK=THV$Sz*gQhKNb*p0fNoda#-&F zB-qJgW^g}!TtM|0bS2QZekW7_tKu%GcJ!4?lObt0z_$mZ4rbQ0o=^curCs3bJK6sq z9fu-aW-l#>z~ca(B;4yv;2RZ?tGYAU)^)Kz{L|4oPj zdOf_?de|#yS)p2v8-N||+XL=O*%3+y)oI(HbM)Ds?q8~HPzIP(vs*G`iddbWq}! z(2!VjP&{Z1w+%eUq^ '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..d3c254e6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'techeer' diff --git a/src/main/java/com/techeer/hackathon/TecheerApplication.java b/src/main/java/com/techeer/hackathon/TecheerApplication.java new file mode 100644 index 00000000..dfdc5a6a --- /dev/null +++ b/src/main/java/com/techeer/hackathon/TecheerApplication.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TecheerApplication { + + public static void main(String[] args) { + SpringApplication.run(TecheerApplication.class, args); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..2e76a0cc --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,20 @@ +spring: + jpa: + database: "mysql" + show-sql: "true" + hibernate: + ddl-auto: "update" + properties: + hibernate: + format_sql: true + generate-ddl: true + + datasource: + driver-class-name: "com.mysql.cj.jdbc.Driver" + url: "jdbc:mysql://localhost:3306/test_db?useSSL=false&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul&characterEncoding=UTF-8&autoReconnect=true&createDatabaseIfNotExist=true" + username: "root" + password: "0000" + + flyway: + enabled: false + baseline-on-migrate: true diff --git a/src/test/java/com/techeer/hackathon/TecheerApplicationTests.java b/src/test/java/com/techeer/hackathon/TecheerApplicationTests.java new file mode 100644 index 00000000..a504a07a --- /dev/null +++ b/src/test/java/com/techeer/hackathon/TecheerApplicationTests.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TecheerApplicationTests { + + @Test + void contextLoads() { + } + +} From 93923eab9338a5543a5219f01417572fa38be9ba Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 03:24:36 +0900 Subject: [PATCH 02/26] =?UTF-8?q?feat:=20Entity=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restaurant/entity/Restaurant.java | 32 ++++++++++++++++ .../domain/review/entity/Review.java | 37 +++++++++++++++++++ .../techeer/hackathon/global/BaseEntity.java | 19 ++++++++++ src/main/resources/application.yml | 26 ++++++------- 4 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/entity/Review.java create mode 100644 src/main/java/com/techeer/hackathon/global/BaseEntity.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java new file mode 100644 index 00000000..3d6b782f --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -0,0 +1,32 @@ +package com.techeer.hackathon.domain.restaurant.entity; + +import com.techeer.hackathon.global.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name="restaurant") +public class Restaurant extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "category", nullable = false) + private String category; + + @Column(name = "name", nullable = false) + private String name; + + @Builder + public Restaurant(String category, String name) { + this.category = category; + this.name = name; + } +} \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java new file mode 100644 index 00000000..e5aa525b --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java @@ -0,0 +1,37 @@ +package com.techeer.hackathon.domain.review.entity; + +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.global.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name="review") +public class Review extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "restaurant", nullable = false) + private Restaurant restaurant; + + @Column(name = "title", nullable = false) + private String title; + + @Column(name = "content", nullable = false) + private String content; + + @Builder + public Review(String title, String content){ + this.title = title; + this.content = content; + } +} \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/global/BaseEntity.java b/src/main/java/com/techeer/hackathon/global/BaseEntity.java new file mode 100644 index 00000000..7e04c57c --- /dev/null +++ b/src/main/java/com/techeer/hackathon/global/BaseEntity.java @@ -0,0 +1,19 @@ +package com.techeer.hackathon.global; + +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) // Auditing(자동으로 값 매핑) +public class BaseEntity { + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2e76a0cc..5272f25d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,20 +1,20 @@ spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/restaurant + username: root + password: qorgksruf123 + jpa: - database: "mysql" - show-sql: "true" hibernate: - ddl-auto: "update" + ddl-auto : create #update properties: hibernate: format_sql: true - generate-ddl: true - - datasource: - driver-class-name: "com.mysql.cj.jdbc.Driver" - url: "jdbc:mysql://localhost:3306/test_db?useSSL=false&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul&characterEncoding=UTF-8&autoReconnect=true&createDatabaseIfNotExist=true" - username: "root" - password: "0000" + use_sql_comments: true + show_sql: true - flyway: - enabled: false - baseline-on-migrate: true +logging: + level: + org: + hibernate: info \ No newline at end of file From 5739b8eae53a1b5d8ac82966fec19484592f765d Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 04:37:12 +0900 Subject: [PATCH 03/26] =?UTF-8?q?feat:=20dto=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restaurant/dto/inquiryRestaurantDTO.java | 18 +++++++++++++++++ .../restaurant/dto/registerRestaurantDTO.java | 20 +++++++++++++++++++ .../restaurant/dto/updateRestaurantDTO.java | 13 ++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java new file mode 100644 index 00000000..e9cc94c6 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java @@ -0,0 +1,18 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor + +public class inquiryRestaurant { + private String name; + private Restaurant category; + private LocalDateTime createData; +} diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java new file mode 100644 index 00000000..3a116218 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java @@ -0,0 +1,20 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor + +public class registerRestaurant { + private final LocalDateTime createDate; + @NotNull + private final String name; + private final String category; +} diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java new file mode 100644 index 00000000..a6629fe9 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +@Getter +@Builder +@AllArgsConstructor +public class updateRestaurant { + private final Long id; + private final Restaurant category; +} From 42f68ef5b912f8b80c40de851b6160b3bb47a099 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 04:38:23 +0900 Subject: [PATCH 04/26] =?UTF-8?q?feat:=20=EB=A0=88=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restaurant/repository/repositoryRestaurant.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java new file mode 100644 index 00000000..47b0ef6c --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java @@ -0,0 +1,10 @@ +package com.techeer.hackathon.domain.restaurant.repository; + +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface repositoryRestaurant extends JpaRepository { + +} From 8d1878c339d06a02167d7f7e84315c8ffcb2a146 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 04:38:56 +0900 Subject: [PATCH 05/26] =?UTF-8?q?feat:=20DTO=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restaurant/dto/inquiryRestaurantDTO.java | 8 ++++---- .../domain/restaurant/dto/registerRestaurantDTO.java | 4 ++-- .../domain/restaurant/dto/updateRestaurantDTO.java | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java index e9cc94c6..d2c6c641 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java @@ -5,14 +5,14 @@ import lombok.Builder; import lombok.Getter; -import java.time.LocalDateTime; - @Getter @Builder @AllArgsConstructor -public class inquiryRestaurant { +public class inquiryRestaurantDTO { + + private Long id; private String name; private Restaurant category; - private LocalDateTime createData; + } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java index 3a116218..20a04a49 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java @@ -4,7 +4,6 @@ import lombok.Builder; import lombok.Getter; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @@ -12,9 +11,10 @@ @Builder @AllArgsConstructor -public class registerRestaurant { +public class registerRestaurantDTO { private final LocalDateTime createDate; @NotNull private final String name; + @NotNull private final String category; } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java index a6629fe9..4d243371 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java @@ -1,13 +1,15 @@ package com.techeer.hackathon.domain.restaurant.dto; -import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; + +import javax.validation.constraints.NotNull; + @Getter @Builder @AllArgsConstructor -public class updateRestaurant { - private final Long id; - private final Restaurant category; +public class updateRestaurantDTO { + @NotNull + private final String category; } From e8977e9100181a9dd690c2a67f30e9b5298a6a5d Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 05:13:37 +0900 Subject: [PATCH 06/26] =?UTF-8?q?feat:=20Mapper=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rantDTO.java => InquiryRestaurantDTO.java} | 0 ...antDTO.java => RegisterRestaurantDTO.java} | 0 ...urantDTO.java => UpdateRestaurantDTO.java} | 0 .../dto/mapper/RestaurantMapper.java | 28 +++++++++++++++++++ ...taurant.java => RepositoryRestaurant.java} | 0 5 files changed, 28 insertions(+) rename src/main/java/com/techeer/hackathon/domain/restaurant/dto/{inquiryRestaurantDTO.java => InquiryRestaurantDTO.java} (100%) rename src/main/java/com/techeer/hackathon/domain/restaurant/dto/{registerRestaurantDTO.java => RegisterRestaurantDTO.java} (100%) rename src/main/java/com/techeer/hackathon/domain/restaurant/dto/{updateRestaurantDTO.java => UpdateRestaurantDTO.java} (100%) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java rename src/main/java/com/techeer/hackathon/domain/restaurant/repository/{repositoryRestaurant.java => RepositoryRestaurant.java} (100%) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java similarity index 100% rename from src/main/java/com/techeer/hackathon/domain/restaurant/dto/inquiryRestaurantDTO.java rename to src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java similarity index 100% rename from src/main/java/com/techeer/hackathon/domain/restaurant/dto/registerRestaurantDTO.java rename to src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java similarity index 100% rename from src/main/java/com/techeer/hackathon/domain/restaurant/dto/updateRestaurantDTO.java rename to src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java new file mode 100644 index 00000000..18e7d25c --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java @@ -0,0 +1,28 @@ +package com.techeer.hackathon.domain.restaurant.dto.mapper; + +import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.stereotype.Component; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +@Component +public class RestaurantMapper { + public Restaurant DtoToEntity(RegisterRestaurantDTO registerRestaurantDTO) { + return Restaurant.builder() + .name(registerRestaurantDTO.getName()) + .category(registerRestaurantDTO.getCategory()) + .build(); + } + + public InquiryRestaurantDTO DtoFromEntity(Restaurant restaurant) { + return InquiryRestaurantDTO.builder() + .id(restaurant.getId()) + .name(restaurant.getName()) + .category(restaurant.getCategory()) + .build(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java similarity index 100% rename from src/main/java/com/techeer/hackathon/domain/restaurant/repository/repositoryRestaurant.java rename to src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java From c192bef8dd44d7b2895e26ebe2cb4086c07bc7c1 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 05:14:01 +0900 Subject: [PATCH 07/26] =?UTF-8?q?feat:=20Mapper=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 9 +++++++++ .../restaurant/dto/InquiryRestaurantDTO.java | 14 ++++---------- .../restaurant/dto/RegisterRestaurantDTO.java | 8 +++----- .../domain/restaurant/dto/UpdateRestaurantDTO.java | 2 +- .../domain/restaurant/entity/Restaurant.java | 1 + 5 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java new file mode 100644 index 00000000..bf96f932 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -0,0 +1,9 @@ +package com.techeer.hackathon.domain.restaurant.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/") +public class ControllerRestaurant { +} diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java index d2c6c641..73199129 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java @@ -1,18 +1,12 @@ package com.techeer.hackathon.domain.restaurant.dto; -import com.techeer.hackathon.domain.restaurant.entity.Restaurant; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; -@Getter @Builder -@AllArgsConstructor - -public class inquiryRestaurantDTO { - +@Getter +public class InquiryRestaurantDTO { private Long id; private String name; - private Restaurant category; - -} + private String category; +} \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java index 20a04a49..81df0a87 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RegisterRestaurantDTO.java @@ -1,17 +1,15 @@ package com.techeer.hackathon.domain.restaurant.dto; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; +import lombok.RequiredArgsConstructor; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @Getter -@Builder -@AllArgsConstructor +@RequiredArgsConstructor -public class registerRestaurantDTO { +public class RegisterRestaurantDTO { private final LocalDateTime createDate; @NotNull private final String name; diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java index 4d243371..2af6173e 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java @@ -9,7 +9,7 @@ @Getter @Builder @AllArgsConstructor -public class updateRestaurantDTO { +public class UpdateRestaurantDTO { @NotNull private final String category; } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index 3d6b782f..08acad7a 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -10,6 +10,7 @@ @Entity @Getter +@Builder @NoArgsConstructor @AllArgsConstructor @Table(name="restaurant") From aab6751a0f74e51ca8db4b50fc93f123febd380a Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 05:14:31 +0900 Subject: [PATCH 08/26] =?UTF-8?q?feat:=20=EB=A0=88=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restaurant/repository/RepositoryRestaurant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java index 47b0ef6c..c7ec2728 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java @@ -5,6 +5,6 @@ import org.springframework.stereotype.Repository; @Repository -public interface repositoryRestaurant extends JpaRepository { +public interface RepositoryRestaurant extends JpaRepository { } From 28622ae408d28d93f76e02dabb0ceaeed2ecc6e4 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 05:40:55 +0900 Subject: [PATCH 09/26] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=B6=94=EA=B0=80=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../techeer/hackathon/TecheerApplication.java | 2 ++ .../controller/ControllerRestaurant.java | 28 ++++++++++++++++++- .../restaurant/service/ServiceRestaurant.java | 19 +++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java diff --git a/src/main/java/com/techeer/hackathon/TecheerApplication.java b/src/main/java/com/techeer/hackathon/TecheerApplication.java index dfdc5a6a..511312db 100644 --- a/src/main/java/com/techeer/hackathon/TecheerApplication.java +++ b/src/main/java/com/techeer/hackathon/TecheerApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication +@EnableJpaAuditing public class TecheerApplication { public static void main(String[] args) { diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index bf96f932..eed91c5f 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -1,9 +1,35 @@ package com.techeer.hackathon.domain.restaurant.controller; +import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.service.ServiceRestaurant; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; @Controller -@RequestMapping("/") +@RequestMapping("/api/v1/restaurant") +@RestController +@RequiredArgsConstructor public class ControllerRestaurant { + private final ServiceRestaurant Res_Service; + private final RestaurantMapper Res_Mapper; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public ResponseEntity createRestaurant( + @RequestBody @Valid RegisterRestaurantDTO registerRestaurantDTO) { + Restaurant insertRestaurant = Res_Service.insertRestaurant(registerRestaurantDTO); + return new ResponseEntity(Res_Mapper.DtoFromEntity(insertRestaurant), HttpStatus.CREATED); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java new file mode 100644 index 00000000..d1d05af3 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -0,0 +1,19 @@ +package com.techeer.hackathon.domain.restaurant.service; + +import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ServiceRestaurant { + private final RepositoryRestaurant Res_Repo; + private final RestaurantMapper Res_Mapper; + + public Restaurant insertRestaurant(RegisterRestaurantDTO registerRestaurantDTO) { + return Res_Repo.save(Res_Mapper.DtoToEntity(registerRestaurantDTO)); + } +} From d52b4507f9463eba0df6636ff8ab76cade35a17f Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 13:43:13 +0900 Subject: [PATCH 10/26] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 25 +++++++++++++++---- .../restaurant/dto/InquiryRestaurantDTO.java | 2 ++ .../domain/restaurant/entity/Restaurant.java | 1 + .../repository/RepositoryRestaurant.java | 2 ++ .../restaurant/service/ServiceRestaurant.java | 12 +++++++++ 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index eed91c5f..fdf78767 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -9,13 +9,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.persistence.criteria.CriteriaBuilder; import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; @Controller @RequestMapping("/api/v1/restaurant") @@ -32,4 +31,20 @@ public ResponseEntity createRestaurant( Restaurant insertRestaurant = Res_Service.insertRestaurant(registerRestaurantDTO); return new ResponseEntity(Res_Mapper.DtoFromEntity(insertRestaurant), HttpStatus.CREATED); } +// @GetMapping +// @ResponseStatus(HttpStatus.OK) +// public ResponseEntity> getRestaurantList(){ +// List restaurants = Res_Service.getRestaurantList(); +// //for문 사용 +// return new ResponseEntity<>( +// restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()) +// , HttpStatus.OK); +// //return new ResponseEntity<>(restaurants, HttpStatus.OK); +// } + @GetMapping + @ResponseStatus(HttpStatus.OK) + public List getAllRestaurants() { + List restaurants = Res_Service.getAllRestaurants(); + return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java index 73199129..85e64008 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java @@ -1,5 +1,6 @@ package com.techeer.hackathon.domain.restaurant.dto; +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import lombok.Builder; import lombok.Getter; @@ -9,4 +10,5 @@ public class InquiryRestaurantDTO { private Long id; private String name; private String category; + } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index 08acad7a..61c68bbb 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -27,6 +27,7 @@ public class Restaurant extends BaseEntity { @Builder public Restaurant(String category, String name) { + this.category = category; this.name = name; } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java index c7ec2728..de0213dc 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java @@ -4,6 +4,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface RepositoryRestaurant extends JpaRepository { diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index d1d05af3..0a14caf4 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -1,12 +1,19 @@ package com.techeer.hackathon.domain.restaurant.service; +import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import lombok.RequiredArgsConstructor; +import org.hibernate.proxy.EntityNotFoundDelegate; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import javax.persistence.EntityNotFoundException; +import java.util.List; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor public class ServiceRestaurant { @@ -16,4 +23,9 @@ public class ServiceRestaurant { public Restaurant insertRestaurant(RegisterRestaurantDTO registerRestaurantDTO) { return Res_Repo.save(Res_Mapper.DtoToEntity(registerRestaurantDTO)); } + + public List getAllRestaurants(){ + return Res_Repo.findAll(); + } + } From b5485e43d68d38bb2d4a09e3e1933e6b5c378f20 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 13:47:22 +0900 Subject: [PATCH 11/26] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=A0=84=EC=B2=B4=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restaurant/controller/ControllerRestaurant.java | 11 +---------- .../domain/restaurant/service/ServiceRestaurant.java | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index fdf78767..9db708f0 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -31,16 +31,7 @@ public ResponseEntity createRestaurant( Restaurant insertRestaurant = Res_Service.insertRestaurant(registerRestaurantDTO); return new ResponseEntity(Res_Mapper.DtoFromEntity(insertRestaurant), HttpStatus.CREATED); } -// @GetMapping -// @ResponseStatus(HttpStatus.OK) -// public ResponseEntity> getRestaurantList(){ -// List restaurants = Res_Service.getRestaurantList(); -// //for문 사용 -// return new ResponseEntity<>( -// restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()) -// , HttpStatus.OK); -// //return new ResponseEntity<>(restaurants, HttpStatus.OK); -// } + @GetMapping @ResponseStatus(HttpStatus.OK) public List getAllRestaurants() { diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index 0a14caf4..365c9314 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -1,18 +1,13 @@ package com.techeer.hackathon.domain.restaurant.service; -import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import lombok.RequiredArgsConstructor; -import org.hibernate.proxy.EntityNotFoundDelegate; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import javax.persistence.EntityNotFoundException; import java.util.List; -import java.util.stream.Collectors; @Service @RequiredArgsConstructor From 428946b2d13db8efbec9b241ecdadb28020df913 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 14:38:58 +0900 Subject: [PATCH 12/26] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=82=AD=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 22 +++++++++++++++++-- .../domain/restaurant/entity/Restaurant.java | 15 ++++++++----- .../repository/RepositoryRestaurant.java | 4 +++- .../restaurant/service/ServiceRestaurant.java | 14 ++++++++++++ .../techeer/hackathon/global/BaseEntity.java | 3 +++ 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 9db708f0..28aa3d92 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -4,6 +4,7 @@ import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import com.techeer.hackathon.domain.restaurant.service.ServiceRestaurant; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -24,6 +25,8 @@ public class ControllerRestaurant { private final ServiceRestaurant Res_Service; private final RestaurantMapper Res_Mapper; + private final RepositoryRestaurant Res_Repo; + @PostMapping @ResponseStatus(HttpStatus.CREATED) public ResponseEntity createRestaurant( @@ -32,10 +35,25 @@ public ResponseEntity createRestaurant( return new ResponseEntity(Res_Mapper.DtoFromEntity(insertRestaurant), HttpStatus.CREATED); } +// @GetMapping +// @ResponseStatus(HttpStatus.OK) +// public List getAllRestaurants() { +// List restaurants = Res_Service.getAllRestaurants(); +// return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); +// } + @GetMapping @ResponseStatus(HttpStatus.OK) public List getAllRestaurants() { - List restaurants = Res_Service.getAllRestaurants(); - return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); + List restaurants = Res_Repo.findByDeletedFalse(); + return restaurants.stream() + .map(Res_Mapper::DtoFromEntity) + .collect(Collectors.toList()); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long id) { + Res_Service.deleteRestaurant(id); + return ResponseEntity.noContent().build(); } } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index 61c68bbb..e6fcb135 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -1,10 +1,7 @@ package com.techeer.hackathon.domain.restaurant.entity; import com.techeer.hackathon.global.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; import javax.persistence.*; @@ -25,10 +22,18 @@ public class Restaurant extends BaseEntity { @Column(name = "name", nullable = false) private String name; + @Column(name = "deleted", nullable = false) + private boolean deleted; + @Builder - public Restaurant(String category, String name) { + public Restaurant(String category, String name, boolean deleted) { this.category = category; this.name = name; + this.deleted = false; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java index de0213dc..d22e06af 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java @@ -5,8 +5,10 @@ import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Optional; @Repository public interface RepositoryRestaurant extends JpaRepository { - + Optional findByIdAndDeletedIsFalse(Long id); + List findByDeletedFalse(); } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index 365c9314..bc0c1e9a 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -6,11 +6,14 @@ import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.webjars.NotFoundException; +import javax.transaction.Transactional; import java.util.List; @Service @RequiredArgsConstructor +@Transactional public class ServiceRestaurant { private final RepositoryRestaurant Res_Repo; private final RestaurantMapper Res_Mapper; @@ -23,4 +26,15 @@ public List getAllRestaurants(){ return Res_Repo.findAll(); } + public void deleteRestaurant(Long id) { + Restaurant restaurant = getRestaurantById(id); + restaurant.setDeleted(true); + Res_Repo.save(restaurant); + } + + private Restaurant getRestaurantById(Long id) { + return Res_Repo.findByIdAndDeletedIsFalse(id) + .orElseThrow(() -> new NotFoundException("Restaurant no found")); + } + } diff --git a/src/main/java/com/techeer/hackathon/global/BaseEntity.java b/src/main/java/com/techeer/hackathon/global/BaseEntity.java index 7e04c57c..5a8d1567 100644 --- a/src/main/java/com/techeer/hackathon/global/BaseEntity.java +++ b/src/main/java/com/techeer/hackathon/global/BaseEntity.java @@ -4,6 +4,7 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import javax.persistence.Column; import javax.persistence.EntityListeners; import javax.persistence.MappedSuperclass; import java.time.LocalDateTime; @@ -12,8 +13,10 @@ @EntityListeners(AuditingEntityListener.class) // Auditing(자동으로 값 매핑) public class BaseEntity { @CreatedDate + @Column(name = "created_at", nullable = false, updatable = false) private LocalDateTime createdAt; @LastModifiedDate + @Column(name = "updated_at", nullable = false) private LocalDateTime updatedAt; } \ No newline at end of file From 75998e29b09bf044917a9a19b187293dc708e705 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 16:53:09 +0900 Subject: [PATCH 13/26] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=84=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 16 ++++++++-------- .../restaurant/dto/mapper/RestaurantMapper.java | 8 ++++++++ .../repository/RepositoryRestaurant.java | 1 + .../restaurant/service/ServiceRestaurant.java | 10 ++++++++++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 28aa3d92..9316880d 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -12,8 +12,9 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.persistence.criteria.CriteriaBuilder; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; import java.util.stream.Collectors; @@ -35,13 +36,6 @@ public ResponseEntity createRestaurant( return new ResponseEntity(Res_Mapper.DtoFromEntity(insertRestaurant), HttpStatus.CREATED); } -// @GetMapping -// @ResponseStatus(HttpStatus.OK) -// public List getAllRestaurants() { -// List restaurants = Res_Service.getAllRestaurants(); -// return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); -// } - @GetMapping @ResponseStatus(HttpStatus.OK) public List getAllRestaurants() { @@ -56,4 +50,10 @@ public ResponseEntity deleteRestaurant(@PathVariable Long id) { Res_Service.deleteRestaurant(id); return ResponseEntity.noContent().build(); } + + @GetMapping("/category") + public List getRestaurantsByCategory(String category) { + List restaurants = Res_Repo.findByCategoryAndDeletedFalse(category); + return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java index 18e7d25c..8174a6ce 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java @@ -7,6 +7,9 @@ import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.stream.Collectors; + @NoArgsConstructor(access = AccessLevel.PRIVATE) @Component public class RestaurantMapper { @@ -25,4 +28,9 @@ public InquiryRestaurantDTO DtoFromEntity(Restaurant restaurant) { .build(); } + public List listEntityToListDto(List restaurantList) { + return restaurantList.stream() + .map(this::DtoFromEntity) + .collect(Collectors.toList()); + } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java index d22e06af..12565540 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/repository/RepositoryRestaurant.java @@ -11,4 +11,5 @@ public interface RepositoryRestaurant extends JpaRepository { Optional findByIdAndDeletedIsFalse(Long id); List findByDeletedFalse(); + List findByCategoryAndDeletedFalse(String category); } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index bc0c1e9a..73037c49 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -1,5 +1,6 @@ package com.techeer.hackathon.domain.restaurant.service; +import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; @@ -10,6 +11,7 @@ import javax.transaction.Transactional; import java.util.List; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -23,6 +25,7 @@ public Restaurant insertRestaurant(RegisterRestaurantDTO registerRestaurantDTO) } public List getAllRestaurants(){ + return Res_Repo.findAll(); } @@ -37,4 +40,11 @@ private Restaurant getRestaurantById(Long id) { .orElseThrow(() -> new NotFoundException("Restaurant no found")); } + public List getRestaurantsByCategory(String category) { + List restaurants = Res_Repo.findByCategoryAndDeletedFalse(category); + return restaurants.stream() + .map(Res_Mapper::DtoFromEntity) + .collect(Collectors.toList()); + } + } From 0d72cc1ef3d5747df7fe7579455f9ee81ed0e862 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 17:22:54 +0900 Subject: [PATCH 14/26] =?UTF-8?q?chore:=20=ED=8C=8C=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- out/production/resources/application.yml | 20 +++++++++++++++++++ .../domain/restaurant/entity/Restaurant.java | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 out/production/resources/application.yml diff --git a/out/production/resources/application.yml b/out/production/resources/application.yml new file mode 100644 index 00000000..5272f25d --- /dev/null +++ b/out/production/resources/application.yml @@ -0,0 +1,20 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/restaurant + username: root + password: qorgksruf123 + + jpa: + hibernate: + ddl-auto : create #update + properties: + hibernate: + format_sql: true + use_sql_comments: true + show_sql: true + +logging: + level: + org: + hibernate: info \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index e6fcb135..4c44dbe8 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -1,7 +1,10 @@ package com.techeer.hackathon.domain.restaurant.entity; import com.techeer.hackathon.global.BaseEntity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; import javax.persistence.*; From d50d95ffad4f1628668ad5c9aaebe670ced47567 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 17:23:20 +0900 Subject: [PATCH 15/26] =?UTF-8?q?chore:=20=ED=8C=8C=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ae207bac..e3fdc4ae 100644 --- a/build.gradle +++ b/build.gradle @@ -19,13 +19,16 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.8' } tasks.named('test') { useJUnitPlatform() -} +} \ No newline at end of file From 481bd712b2d6605b666ae499a452f9259a4a623f Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 18:39:48 +0900 Subject: [PATCH 16/26] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=83=81=EC=84=B8=EB=82=B4=EC=97=AD=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restaurant/controller/ControllerRestaurant.java | 9 +++++++++ .../domain/restaurant/dto/InquiryRestaurantDTO.java | 4 ++++ .../domain/restaurant/dto/mapper/RestaurantMapper.java | 6 +----- .../hackathon/domain/restaurant/entity/Restaurant.java | 3 ++- .../domain/restaurant/service/ServiceRestaurant.java | 9 +++++++++ .../java/com/techeer/hackathon/global/BaseEntity.java | 6 +++++- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 9316880d..8db2c317 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -7,6 +7,8 @@ import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import com.techeer.hackathon.domain.restaurant.service.ServiceRestaurant; import lombok.RequiredArgsConstructor; +import org.hibernate.annotations.GeneratorType; +import org.springframework.data.repository.cdi.Eager; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -56,4 +58,11 @@ public List getRestaurantsByCategory(String category) { List restaurants = Res_Repo.findByCategoryAndDeletedFalse(category); return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); } + + @GetMapping("/{id}") + public ResponseEntity getRestaurant(@PathVariable Long id) { + InquiryRestaurantDTO restaurant = Res_Service.getRestaurant(id); + return ResponseEntity.ok().body(restaurant); + } + } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java index 85e64008..0beab627 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java @@ -1,14 +1,18 @@ package com.techeer.hackathon.domain.restaurant.dto; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.global.BaseEntity; import lombok.Builder; import lombok.Getter; +import java.time.LocalDateTime; + @Builder @Getter public class InquiryRestaurantDTO { private Long id; private String name; private String category; + private LocalDateTime createdAt; } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java index 8174a6ce..800b2f1a 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java @@ -25,12 +25,8 @@ public InquiryRestaurantDTO DtoFromEntity(Restaurant restaurant) { .id(restaurant.getId()) .name(restaurant.getName()) .category(restaurant.getCategory()) + .createdAt(restaurant.getCreatedAt()) .build(); } - public List listEntityToListDto(List restaurantList) { - return restaurantList.stream() - .map(this::DtoFromEntity) - .collect(Collectors.toList()); - } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index 4c44dbe8..50dcfcda 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -7,10 +7,11 @@ import lombok.NoArgsConstructor; import javax.persistence.*; +import java.time.LocalDate; +import java.time.LocalDateTime; @Entity @Getter -@Builder @NoArgsConstructor @AllArgsConstructor @Table(name="restaurant") diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index 73037c49..e084fd82 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -7,10 +7,12 @@ import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.web.client.ResourceAccessException; import org.webjars.NotFoundException; import javax.transaction.Transactional; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -47,4 +49,11 @@ public List getRestaurantsByCategory(String category) { .collect(Collectors.toList()); } + public InquiryRestaurantDTO getRestaurant(Long id) { + Restaurant restaurant = Res_Repo.findById(id) + .orElseThrow(() -> new NotFoundException("Restaurant not found")); + + return Res_Mapper.DtoFromEntity(restaurant); + } + } diff --git a/src/main/java/com/techeer/hackathon/global/BaseEntity.java b/src/main/java/com/techeer/hackathon/global/BaseEntity.java index 5a8d1567..bc1a4ee9 100644 --- a/src/main/java/com/techeer/hackathon/global/BaseEntity.java +++ b/src/main/java/com/techeer/hackathon/global/BaseEntity.java @@ -11,7 +11,7 @@ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) // Auditing(자동으로 값 매핑) -public class BaseEntity { +public abstract class BaseEntity { @CreatedDate @Column(name = "created_at", nullable = false, updatable = false) private LocalDateTime createdAt; @@ -19,4 +19,8 @@ public class BaseEntity { @LastModifiedDate @Column(name = "updated_at", nullable = false) private LocalDateTime updatedAt; + + public LocalDateTime getCreatedAt() { + return createdAt; + } } \ No newline at end of file From 16480fa5d1066c6448a03a182fd4d1167a2f6739 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 19:34:40 +0900 Subject: [PATCH 17/26] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restaurant/controller/ControllerRestaurant.java | 7 +++++++ .../domain/restaurant/dto/InquiryRestaurantDTO.java | 2 -- .../domain/restaurant/dto/UpdateRestaurantDTO.java | 2 ++ .../restaurant/dto/mapper/RestaurantMapper.java | 11 +++++++++-- .../domain/restaurant/entity/Restaurant.java | 6 ++++-- .../domain/restaurant/service/ServiceRestaurant.java | 10 ++++++++++ .../java/com/techeer/hackathon/global/BaseEntity.java | 4 ++++ 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 8db2c317..c96d1116 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -2,12 +2,14 @@ import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.UpdateRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import com.techeer.hackathon.domain.restaurant.service.ServiceRestaurant; import lombok.RequiredArgsConstructor; import org.hibernate.annotations.GeneratorType; +import org.hibernate.sql.Update; import org.springframework.data.repository.cdi.Eager; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -65,4 +67,9 @@ public ResponseEntity getRestaurant(@PathVariable Long id) return ResponseEntity.ok().body(restaurant); } + @PutMapping("/id/{id}/{category}") + public ResponseEntity updateRestaurantCategory(@PathVariable("id") Long id, @PathVariable("category") String category) { + return ResponseEntity.ok(Res_Service.updateRestaurantCategory(id,category)); + } + } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java index 0beab627..a7119242 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/InquiryRestaurantDTO.java @@ -1,7 +1,5 @@ package com.techeer.hackathon.domain.restaurant.dto; -import com.techeer.hackathon.domain.restaurant.entity.Restaurant; -import com.techeer.hackathon.global.BaseEntity; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java index 2af6173e..90e72884 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/UpdateRestaurantDTO.java @@ -5,6 +5,7 @@ import lombok.Getter; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; @Getter @Builder @@ -12,4 +13,5 @@ public class UpdateRestaurantDTO { @NotNull private final String category; + private final LocalDateTime updatedAt; } diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java index 800b2f1a..85145253 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/dto/mapper/RestaurantMapper.java @@ -2,13 +2,12 @@ import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.UpdateRestaurantDTO; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.stream.Collectors; @NoArgsConstructor(access = AccessLevel.PRIVATE) @Component @@ -29,4 +28,12 @@ public InquiryRestaurantDTO DtoFromEntity(Restaurant restaurant) { .build(); } + public UpdateRestaurantDTO UpdateFromEntity(Restaurant restaurant) { + return UpdateRestaurantDTO.builder() + .category(restaurant.getCategory()) + .updatedAt(restaurant.getUpdatedAt()) + .build(); + } + + } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java index 50dcfcda..f204f5e9 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/entity/Restaurant.java @@ -7,8 +7,6 @@ import lombok.NoArgsConstructor; import javax.persistence.*; -import java.time.LocalDate; -import java.time.LocalDateTime; @Entity @Getter @@ -40,4 +38,8 @@ public Restaurant(String category, String name, boolean deleted) { public void setDeleted(boolean deleted) { this.deleted = deleted; } + + public void setCategory(String category) { + this.category = category; + } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index e084fd82..dd79e175 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -2,6 +2,7 @@ import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; +import com.techeer.hackathon.domain.restaurant.dto.UpdateRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; @@ -10,6 +11,7 @@ import org.springframework.web.client.ResourceAccessException; import org.webjars.NotFoundException; +import javax.persistence.EntityNotFoundException; import javax.transaction.Transactional; import java.util.List; import java.util.Optional; @@ -56,4 +58,12 @@ public InquiryRestaurantDTO getRestaurant(Long id) { return Res_Mapper.DtoFromEntity(restaurant); } + public UpdateRestaurantDTO updateRestaurantCategory(Long id, String newCategory){ + Restaurant restaurant = Res_Repo.findById(id).orElseThrow( + () -> new EntityNotFoundException("Restaurant not found with id " + id)); + restaurant.setCategory(newCategory); + Res_Repo.save(restaurant); + return Res_Mapper.UpdateFromEntity(restaurant); + } + } diff --git a/src/main/java/com/techeer/hackathon/global/BaseEntity.java b/src/main/java/com/techeer/hackathon/global/BaseEntity.java index bc1a4ee9..a0c2eb78 100644 --- a/src/main/java/com/techeer/hackathon/global/BaseEntity.java +++ b/src/main/java/com/techeer/hackathon/global/BaseEntity.java @@ -23,4 +23,8 @@ public abstract class BaseEntity { public LocalDateTime getCreatedAt() { return createdAt; } + + public LocalDateTime getUpdatedAt() { + return updatedAt; + } } \ No newline at end of file From be6267ad8887ac345aae15c841fc956c087d6837 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 20:13:59 +0900 Subject: [PATCH 18/26] =?UTF-8?q?feat:=20=EC=B4=88=EA=B8=B0=20=EC=84=B8?= =?UTF-8?q?=ED=8C=85=20=EB=B0=8F=20=EB=A6=AC=EB=B7=B0=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ControllerReview.java | 32 ++++++++++++++++ .../domain/review/dto/CreateReviewDTO.java | 16 ++++++++ .../domain/review/dto/InquiryReviewDTO.java | 16 ++++++++ .../domain/review/dto/UpdateReviewDTO.java | 15 ++++++++ .../review/dto/mapper/ReviewMapper.java | 37 +++++++++++++++++++ .../domain/review/entity/Review.java | 3 +- .../review/repository/RepositoryReview.java | 9 +++++ .../domain/review/service/ServiceReview.java | 19 ++++++++++ 8 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/dto/CreateReviewDTO.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/dto/UpdateReviewDTO.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java create mode 100644 src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java diff --git a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java new file mode 100644 index 00000000..dee10dfa --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java @@ -0,0 +1,32 @@ +package com.techeer.hackathon.domain.review.controller; + +import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; +import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; +import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; +import com.techeer.hackathon.domain.review.entity.Review; +import com.techeer.hackathon.domain.review.repository.RepositoryReview; +import com.techeer.hackathon.domain.review.service.ServiceReview; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@Controller +@RequestMapping("/api/v1/review") +@RestController +@RequiredArgsConstructor +public class ControllerReview { + private final ServiceReview Rev_Serv; + private final ReviewMapper Rev_Mapper; + + @PostMapping("/register") + @ResponseStatus(HttpStatus.CREATED) + public ResponseEntity createReview( + @RequestBody @Valid CreateReviewDTO createReviewDTO) { + Review insertReview = Rev_Serv.insertReview(createReviewDTO); + return new ResponseEntity(Rev_Mapper.ReviewEntityToDto(insertReview), HttpStatus.CREATED); + } +} diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/CreateReviewDTO.java b/src/main/java/com/techeer/hackathon/domain/review/dto/CreateReviewDTO.java new file mode 100644 index 00000000..3c21683a --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/CreateReviewDTO.java @@ -0,0 +1,16 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import javax.validation.constraints.NotNull; + +@Getter +@RequiredArgsConstructor +public class CreateReviewDTO { + @NotNull + private Long restaurantId; + @NotNull + private String title; + private String content; +} diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java b/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java new file mode 100644 index 00000000..15c99ef2 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java @@ -0,0 +1,16 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Builder +@Getter +public class InquiryReviewDTO { + private Long id; + private String restaurantName; + private String title; + private String content; + +} \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/UpdateReviewDTO.java b/src/main/java/com/techeer/hackathon/domain/review/dto/UpdateReviewDTO.java new file mode 100644 index 00000000..84ec64d7 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/UpdateReviewDTO.java @@ -0,0 +1,15 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import javax.validation.constraints.NotNull; + +@Getter +@RequiredArgsConstructor +public class UpdateReviewDTO { + @NotNull + private String title; + @NotNull + private String content; +} diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java b/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java new file mode 100644 index 00000000..f2316fb1 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java @@ -0,0 +1,37 @@ +package com.techeer.hackathon.domain.review.dto.mapper; + +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; +import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; +import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; +import com.techeer.hackathon.domain.review.entity.Review; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import javax.persistence.Access; +import javax.persistence.criteria.CriteriaBuilder; + +@RequiredArgsConstructor +//@NoArgsConstructor(access = AccessLevel.PRIVATE) +@Component +public class ReviewMapper { + private final RepositoryRestaurant Res_Repo; + public Review ReviewDtoToEntity(CreateReviewDTO createReviewDTO) { + Restaurant restaurant = Res_Repo.findById(createReviewDTO.getRestaurantId()).orElseThrow(RuntimeException::new); + return Review.builder() + .title(createReviewDTO.getTitle()) + .content(createReviewDTO.getContent()) + .restaurant(restaurant) + .build(); + } + public InquiryReviewDTO ReviewEntityToDto(Review review) { + return InquiryReviewDTO.builder() + .id(review.getId()) + .title(review.getTitle()) + .content(review.getContent()) + .restaurantName(review.getRestaurant().getName()) + .build(); + } +} diff --git a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java index e5aa525b..936dd6d6 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java +++ b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java @@ -30,8 +30,9 @@ public class Review extends BaseEntity { private String content; @Builder - public Review(String title, String content){ + public Review(String title, String content, Restaurant restaurant){ this.title = title; this.content = content; + this.restaurant = restaurant; } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java new file mode 100644 index 00000000..3c6d5914 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java @@ -0,0 +1,9 @@ +package com.techeer.hackathon.domain.review.repository; + +import com.techeer.hackathon.domain.review.entity.Review; +import org.springframework.data.jpa.repository.JpaRepository; + +import javax.swing.*; + +public interface RepositoryReview extends JpaRepository { +} diff --git a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java new file mode 100644 index 00000000..102913a0 --- /dev/null +++ b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java @@ -0,0 +1,19 @@ +package com.techeer.hackathon.domain.review.service; + +import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; +import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; +import com.techeer.hackathon.domain.review.entity.Review; +import com.techeer.hackathon.domain.review.repository.RepositoryReview; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ServiceReview { + private final RepositoryReview Rev_Repo; + private final ReviewMapper Rev_Mapper; + + public Review insertReview(CreateReviewDTO createReviewDTO) { + return Rev_Repo.save(Rev_Mapper.ReviewDtoToEntity(createReviewDTO)); + } +} From c26283f787c235e8324074d0c6615193f80cdc5e Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 20:15:16 +0900 Subject: [PATCH 19/26] =?UTF-8?q?chore:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restaurant/controller/ControllerRestaurant.java | 6 ------ .../domain/restaurant/service/ServiceRestaurant.java | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index c96d1116..96f67e1f 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -2,23 +2,17 @@ import com.techeer.hackathon.domain.restaurant.dto.InquiryRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.RegisterRestaurantDTO; -import com.techeer.hackathon.domain.restaurant.dto.UpdateRestaurantDTO; import com.techeer.hackathon.domain.restaurant.dto.mapper.RestaurantMapper; import com.techeer.hackathon.domain.restaurant.entity.Restaurant; import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import com.techeer.hackathon.domain.restaurant.service.ServiceRestaurant; import lombok.RequiredArgsConstructor; -import org.hibernate.annotations.GeneratorType; -import org.hibernate.sql.Update; -import org.springframework.data.repository.cdi.Eager; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index dd79e175..9493e9cc 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -8,13 +8,11 @@ import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.client.ResourceAccessException; import org.webjars.NotFoundException; import javax.persistence.EntityNotFoundException; import javax.transaction.Transactional; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; @Service From c44d108fe2f4f36ce4ba0a85a2e3985be321a309 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 20:31:53 +0900 Subject: [PATCH 20/26] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/review/controller/ControllerReview.java | 7 ++++++- .../hackathon/domain/review/service/ServiceReview.java | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java index dee10dfa..6824f2e1 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java @@ -4,7 +4,6 @@ import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; import com.techeer.hackathon.domain.review.entity.Review; -import com.techeer.hackathon.domain.review.repository.RepositoryReview; import com.techeer.hackathon.domain.review.service.ServiceReview; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -29,4 +28,10 @@ public ResponseEntity createReview( Review insertReview = Rev_Serv.insertReview(createReviewDTO); return new ResponseEntity(Rev_Mapper.ReviewEntityToDto(insertReview), HttpStatus.CREATED); } + + @GetMapping("/{id}") + public ResponseEntity getReview(@PathVariable Long id) { + InquiryReviewDTO review = Rev_Serv.getReview(id); + return ResponseEntity.ok().body(review); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java index 102913a0..773cad43 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java @@ -1,11 +1,13 @@ package com.techeer.hackathon.domain.review.service; import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; +import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; import com.techeer.hackathon.domain.review.entity.Review; import com.techeer.hackathon.domain.review.repository.RepositoryReview; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.webjars.NotFoundException; @Service @RequiredArgsConstructor @@ -16,4 +18,10 @@ public class ServiceReview { public Review insertReview(CreateReviewDTO createReviewDTO) { return Rev_Repo.save(Rev_Mapper.ReviewDtoToEntity(createReviewDTO)); } + + public InquiryReviewDTO getReview(Long id) { + Review review = Rev_Repo.findById(id) + .orElseThrow(() -> new NotFoundException("Review not found")); + return Rev_Mapper.ReviewEntityToDto(review); + } } From 6521108608456db0e0fbb83bc0180da0b388a5f2 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 20:53:11 +0900 Subject: [PATCH 21/26] =?UTF-8?q?chore:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=83=81=EC=84=B8=EB=82=B4=EC=97=AD=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 16 +++++++++++++--- .../restaurant/service/ServiceRestaurant.java | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 96f67e1f..05db77b3 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -55,10 +55,20 @@ public List getRestaurantsByCategory(String category) { return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); } +// @GetMapping("/{id}") +// public ResponseEntity getRestaurant(@PathVariable Long id) { +// InquiryRestaurantDTO restaurant = Res_Service.getRestaurant(id); +// return ResponseEntity.ok().body(restaurant); +// } @GetMapping("/{id}") - public ResponseEntity getRestaurant(@PathVariable Long id) { - InquiryRestaurantDTO restaurant = Res_Service.getRestaurant(id); - return ResponseEntity.ok().body(restaurant); + public InquiryRestaurantDTO getRestaurantById(@PathVariable Long id) { + Restaurant restaurant = Res_Service.getRestaurantByIdAndDeletedIsFalse(id); + return InquiryRestaurantDTO.builder() + .id(restaurant.getId()) + .name(restaurant.getName()) + .category(restaurant.getCategory()) + .createdAt(restaurant.getCreatedAt()) + .build(); } @PutMapping("/id/{id}/{category}") diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java index 9493e9cc..654a16d0 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/service/ServiceRestaurant.java @@ -13,6 +13,7 @@ import javax.persistence.EntityNotFoundException; import javax.transaction.Transactional; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -49,11 +50,18 @@ public List getRestaurantsByCategory(String category) { .collect(Collectors.toList()); } - public InquiryRestaurantDTO getRestaurant(Long id) { - Restaurant restaurant = Res_Repo.findById(id) - .orElseThrow(() -> new NotFoundException("Restaurant not found")); - - return Res_Mapper.DtoFromEntity(restaurant); +// public InquiryRestaurantDTO getRestaurant(Long id) { +// Restaurant restaurant = Res_Repo.findById(id) +// .orElseThrow(() -> new NotFoundException("Restaurant not found")); +// +// return Res_Mapper.DtoFromEntity(restaurant); +// } + public Restaurant getRestaurantByIdAndDeletedIsFalse(Long id) { + Optional optionalRestaurant = Res_Repo.findByIdAndDeletedIsFalse(id); + if (optionalRestaurant.isEmpty()) { + throw new RuntimeException(); + } + return optionalRestaurant.get(); } public UpdateRestaurantDTO updateRestaurantCategory(Long id, String newCategory){ From abc6294c34122dec1b23b1eb6b125af485d91303 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 21:05:29 +0900 Subject: [PATCH 22/26] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/review/controller/ControllerReview.java | 6 ++++++ .../techeer/hackathon/domain/review/entity/Review.java | 10 +++++++++- .../domain/review/repository/RepositoryReview.java | 2 ++ .../hackathon/domain/review/service/ServiceReview.java | 8 ++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java index 6824f2e1..eee6847e 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java @@ -34,4 +34,10 @@ public ResponseEntity getReview(@PathVariable Long id) { InquiryReviewDTO review = Rev_Serv.getReview(id); return ResponseEntity.ok().body(review); } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteReview(@PathVariable("id") Long id) { + Rev_Serv.deleteReview(id); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java index 936dd6d6..a2a898ea 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java +++ b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java @@ -29,10 +29,18 @@ public class Review extends BaseEntity { @Column(name = "content", nullable = false) private String content; + @Column(name = "deleted", nullable = false) + private boolean deleted; + @Builder - public Review(String title, String content, Restaurant restaurant){ + public Review(String title, String content, Restaurant restaurant, boolean deleted){ this.title = title; this.content = content; this.restaurant = restaurant; + this.deleted = false; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java index 3c6d5914..675eee59 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java @@ -4,6 +4,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import javax.swing.*; +import java.util.Optional; public interface RepositoryReview extends JpaRepository { + Optional findByIdAndDeletedFalse(Long id); } diff --git a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java index 773cad43..57336d89 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java @@ -6,6 +6,7 @@ import com.techeer.hackathon.domain.review.entity.Review; import com.techeer.hackathon.domain.review.repository.RepositoryReview; import lombok.RequiredArgsConstructor; +import org.aspectj.weaver.ast.Not; import org.springframework.stereotype.Service; import org.webjars.NotFoundException; @@ -24,4 +25,11 @@ public InquiryReviewDTO getReview(Long id) { .orElseThrow(() -> new NotFoundException("Review not found")); return Rev_Mapper.ReviewEntityToDto(review); } + + public void deleteReview(Long id) { + Review review = Rev_Repo.findByIdAndDeletedFalse(id) + .orElseThrow(() -> new NotFoundException("Review is not found")); + review.setDeleted(true); + Rev_Repo.delete(review); + } } From a2eca443243e3ebc375e9c154a8e308090785713 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 21:19:03 +0900 Subject: [PATCH 23/26] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ControllerReview.java | 7 ++++++ .../domain/review/entity/Review.java | 8 +++++++ .../domain/review/service/ServiceReview.java | 23 +++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java index eee6847e..24922e4a 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java @@ -2,6 +2,7 @@ import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; +import com.techeer.hackathon.domain.review.dto.UpdateReviewDTO; import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; import com.techeer.hackathon.domain.review.entity.Review; import com.techeer.hackathon.domain.review.service.ServiceReview; @@ -40,4 +41,10 @@ public ResponseEntity getReview(@PathVariable Long id) { public void deleteReview(@PathVariable("id") Long id) { Rev_Serv.deleteReview(id); } + + @PutMapping("/{id}") + public ResponseEntity updateReview(@PathVariable Long id, @RequestBody UpdateReviewDTO updateReviewDTO) { + InquiryReviewDTO result = Rev_Serv.updateReview(id, updateReviewDTO); + return ResponseEntity.status(HttpStatus.OK).body(result); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java index a2a898ea..c2a8a22c 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java +++ b/src/main/java/com/techeer/hackathon/domain/review/entity/Review.java @@ -43,4 +43,12 @@ public Review(String title, String content, Restaurant restaurant, boolean delet public void setDeleted(boolean deleted) { this.deleted = deleted; } + + public void setTitle(String title) { + this.title = title; + } + + public void setContent(String content) { + this.content = content; + } } \ No newline at end of file diff --git a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java index 57336d89..6cd6aa66 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java @@ -1,12 +1,16 @@ package com.techeer.hackathon.domain.review.service; +import com.techeer.hackathon.domain.restaurant.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.repository.RepositoryRestaurant; import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; +import com.techeer.hackathon.domain.review.dto.UpdateReviewDTO; import com.techeer.hackathon.domain.review.dto.mapper.ReviewMapper; import com.techeer.hackathon.domain.review.entity.Review; import com.techeer.hackathon.domain.review.repository.RepositoryReview; import lombok.RequiredArgsConstructor; import org.aspectj.weaver.ast.Not; +import org.hibernate.sql.Update; import org.springframework.stereotype.Service; import org.webjars.NotFoundException; @@ -15,6 +19,7 @@ public class ServiceReview { private final RepositoryReview Rev_Repo; private final ReviewMapper Rev_Mapper; + private final RepositoryRestaurant Res_Repo; public Review insertReview(CreateReviewDTO createReviewDTO) { return Rev_Repo.save(Rev_Mapper.ReviewDtoToEntity(createReviewDTO)); @@ -32,4 +37,22 @@ public void deleteReview(Long id) { review.setDeleted(true); Rev_Repo.delete(review); } + + public InquiryReviewDTO updateReview(Long id, UpdateReviewDTO updateReviewDTO) { + Review review = Rev_Repo.findById(id) + .orElseThrow(() -> new RuntimeException()); + + review.setTitle(updateReviewDTO.getTitle()); + review.setContent(updateReviewDTO.getContent()); + + Restaurant restaurant = Res_Repo.findById(review.getRestaurant().getId()) + .orElseThrow(() -> new RuntimeException()); + InquiryReviewDTO inquiryReviewDTO = InquiryReviewDTO.builder() + .id(review.getId()) + .restaurantName(restaurant.getName()) + .title(review.getTitle()) + .content(review.getContent()) + .build(); + return inquiryReviewDTO; + } } From 220315037c3b03fbf982adff33766a0566579eca Mon Sep 17 00:00:00 2001 From: hangyeol Date: Sun, 26 Feb 2023 23:56:51 +0900 Subject: [PATCH 24/26] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9,=20=EB=82=B4=EC=9A=A9=20=EA=B2=80=EC=83=89=20API,=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=88=9C,=20=EC=97=AD=EC=88=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ControllerRestaurant.java | 5 --- .../review/controller/ControllerReview.java | 35 +++++++++++++++++++ .../domain/review/dto/InquiryReviewDTO.java | 2 -- .../review/dto/mapper/ReviewMapper.java | 12 ++++--- .../review/repository/RepositoryReview.java | 14 +++++++- .../domain/review/service/ServiceReview.java | 21 +++++++++-- .../techeer/hackathon/global/BaseEntity.java | 2 +- 7 files changed, 76 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java index 05db77b3..c32d7700 100644 --- a/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java +++ b/src/main/java/com/techeer/hackathon/domain/restaurant/controller/ControllerRestaurant.java @@ -55,11 +55,6 @@ public List getRestaurantsByCategory(String category) { return restaurants.stream().map(Res_Mapper::DtoFromEntity).collect(Collectors.toList()); } -// @GetMapping("/{id}") -// public ResponseEntity getRestaurant(@PathVariable Long id) { -// InquiryRestaurantDTO restaurant = Res_Service.getRestaurant(id); -// return ResponseEntity.ok().body(restaurant); -// } @GetMapping("/{id}") public InquiryRestaurantDTO getRestaurantById(@PathVariable Long id) { Restaurant restaurant = Res_Service.getRestaurantByIdAndDeletedIsFalse(id); diff --git a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java index 24922e4a..77106a06 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/controller/ControllerReview.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; @Controller @RequestMapping("/api/v1/review") @@ -47,4 +49,37 @@ public ResponseEntity updateReview(@PathVariable Long id, @Req InquiryReviewDTO result = Rev_Serv.updateReview(id, updateReviewDTO); return ResponseEntity.status(HttpStatus.OK).body(result); } + + @GetMapping("/search") + public ResponseEntity getReviewsForSearch( + @RequestParam(defaultValue = "0") Integer page, + @RequestParam(defaultValue = "10") Integer size, + @RequestParam(required = false) String title, + @RequestParam(required = false) String content) { + return ResponseEntity.ok(Rev_Serv.getReviewForSearch(page, size, title, content)); + } + + @GetMapping("/list") + public List getReviewsByCreatedTime() { + List reviews = Rev_Serv.getReviewsByCreatedTime(); + return reviews.stream() + .map(this::mapToInquiryReviewDTO) + .collect(Collectors.toList()); + } + + @GetMapping("/list/reverse") + public List getReviewsByReverseCreatedTime() { + List reviews = Rev_Serv.getReviewsByReverseCreatedTime(); + return reviews.stream() + .map(this::mapToInquiryReviewDTO) + .collect(Collectors.toList()); + } + private InquiryReviewDTO mapToInquiryReviewDTO(Review review) { + return InquiryReviewDTO.builder() + .id(review.getId()) + .restaurantName(review.getRestaurant().getName()) + .title(review.getTitle()) + .content(review.getContent()) + .build(); + } } diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java b/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java index 15c99ef2..3e289b0e 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/InquiryReviewDTO.java @@ -3,8 +3,6 @@ import lombok.Builder; import lombok.Getter; -import java.time.LocalDateTime; - @Builder @Getter public class InquiryReviewDTO { diff --git a/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java b/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java index f2316fb1..3795a3e5 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java +++ b/src/main/java/com/techeer/hackathon/domain/review/dto/mapper/ReviewMapper.java @@ -5,13 +5,12 @@ import com.techeer.hackathon.domain.review.dto.CreateReviewDTO; import com.techeer.hackathon.domain.review.dto.InquiryReviewDTO; import com.techeer.hackathon.domain.review.entity.Review; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; import org.springframework.stereotype.Component; -import javax.persistence.Access; -import javax.persistence.criteria.CriteriaBuilder; +import java.util.List; +import java.util.stream.Collectors; @RequiredArgsConstructor //@NoArgsConstructor(access = AccessLevel.PRIVATE) @@ -34,4 +33,9 @@ public InquiryReviewDTO ReviewEntityToDto(Review review) { .restaurantName(review.getRestaurant().getName()) .build(); } + + public List inquiryReviewDTOListFromEntity(Page reviewPage) { + List inquiryReviewDTOList = reviewPage.stream().map(this::ReviewEntityToDto).collect(Collectors.toList()); + return inquiryReviewDTOList; + } } diff --git a/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java index 675eee59..e2d62d76 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/repository/RepositoryReview.java @@ -1,11 +1,23 @@ package com.techeer.hackathon.domain.review.repository; import com.techeer.hackathon.domain.review.entity.Review; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; -import javax.swing.*; +import java.util.List; import java.util.Optional; public interface RepositoryReview extends JpaRepository { Optional findByIdAndDeletedFalse(Long id); + + @Query(value = "SELECT r\n " + + "FROM Review r\n " + + "WHERE (r.title = '' OR r.title Like CONCAT('%', :title, '%'))\n " + + "AND (r.content = '' OR r.content Like CONCAT('%', :content, '%'))\n") + Page findAllBySearch(String title, String content, Pageable pageable); + + List findAllByOrderByCreatedAtAsc(); + List findAllByOrderByCreatedAtDesc(); } diff --git a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java index 6cd6aa66..26c3d48b 100644 --- a/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java +++ b/src/main/java/com/techeer/hackathon/domain/review/service/ServiceReview.java @@ -9,11 +9,14 @@ import com.techeer.hackathon.domain.review.entity.Review; import com.techeer.hackathon.domain.review.repository.RepositoryReview; import lombok.RequiredArgsConstructor; -import org.aspectj.weaver.ast.Not; -import org.hibernate.sql.Update; + +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.webjars.NotFoundException; +import java.util.List; + @Service @RequiredArgsConstructor public class ServiceReview { @@ -55,4 +58,18 @@ public InquiryReviewDTO updateReview(Long id, UpdateReviewDTO updateReviewDTO) { .build(); return inquiryReviewDTO; } + + public Object getReviewForSearch(Integer page, Integer size, String title, String content) { + Pageable pageable = PageRequest.of(page, size); + return Rev_Mapper.inquiryReviewDTOListFromEntity(Rev_Repo.findAllBySearch(title, content, pageable)); + } + + public List getReviewsByCreatedTime() { + return Rev_Repo.findAllByOrderByCreatedAtAsc(); + } + + public List getReviewsByReverseCreatedTime() { + return Rev_Repo.findAllByOrderByCreatedAtDesc(); + } + } diff --git a/src/main/java/com/techeer/hackathon/global/BaseEntity.java b/src/main/java/com/techeer/hackathon/global/BaseEntity.java index a0c2eb78..50db78f4 100644 --- a/src/main/java/com/techeer/hackathon/global/BaseEntity.java +++ b/src/main/java/com/techeer/hackathon/global/BaseEntity.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @MappedSuperclass -@EntityListeners(AuditingEntityListener.class) // Auditing(자동으로 값 매핑) +@EntityListeners(AuditingEntityListener.class) public abstract class BaseEntity { @CreatedDate @Column(name = "created_at", nullable = false, updatable = false) From 44df1da9f13efdd70d63dbe5cf3280c36b1c4ab6 Mon Sep 17 00:00:00 2001 From: hangyeol Date: Mon, 27 Feb 2023 00:01:44 +0900 Subject: [PATCH 25/26] feat: gitignore --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e69de29b From 01a01e835c2f208eb05471080d338e45e165a18f Mon Sep 17 00:00:00 2001 From: hangyeol Date: Mon, 27 Feb 2023 00:02:44 +0900 Subject: [PATCH 26/26] feat: gitignore --- .gitignore | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29b..e48b6be6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ \ No newline at end of file