From f06d922887d0320d96018debf56f960f9ab552ab Mon Sep 17 00:00:00 2001 From: nicoroldan28 Date: Thu, 10 Jun 2021 19:40:15 -0300 Subject: [PATCH] develop --- .gitignore | 33 ++ .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + bdd.sql | 198 +++++++++++ modelo.mwb | Bin 0 -> 11339 bytes mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 130 ++++++++ schema.mwb | Bin 0 -> 28265 bytes .../java/com/api/UDEE/UdeeApplication.java | 52 +++ .../java/com/api/UDEE/Utils/Constants.java | 9 + .../com/api/UDEE/Utils/EntityURLBuilder.java | 15 + src/main/java/com/api/UDEE/config/Conf.java | 15 + .../api/UDEE/config/SpecsConfiguration.java | 18 + .../UDEE/controller/AddressController.java | 65 ++++ .../api/UDEE/controller/BillController.java | 67 ++++ .../api/UDEE/controller/BrandController.java | 65 ++++ .../api/UDEE/controller/ClientController.java | 67 ++++ .../controller/MeasurementController.java | 65 ++++ .../api/UDEE/controller/MeterController.java | 66 ++++ .../api/UDEE/controller/ModelController.java | 68 ++++ .../api/UDEE/controller/RateController.java | 63 ++++ .../UDEE/controller/UsuarioController.java | 117 +++++++ .../java/com/api/UDEE/domain/Address.java | 40 +++ src/main/java/com/api/UDEE/domain/Bill.java | 45 +++ src/main/java/com/api/UDEE/domain/Brand.java | 29 ++ src/main/java/com/api/UDEE/domain/Client.java | 36 ++ .../java/com/api/UDEE/domain/Employee.java | 26 ++ .../java/com/api/UDEE/domain/Measurement.java | 32 ++ src/main/java/com/api/UDEE/domain/Meter.java | 37 +++ src/main/java/com/api/UDEE/domain/Model.java | 24 ++ .../api/UDEE/domain/PaginationResponse.java | 17 + .../com/api/UDEE/domain/PostResponse.java | 14 + src/main/java/com/api/UDEE/domain/Rate.java | 23 ++ .../java/com/api/UDEE/domain/TypeUser.java | 17 + src/main/java/com/api/UDEE/domain/User.java | 29 ++ .../java/com/api/UDEE/domain/Usuario.java | 52 +++ .../com/api/UDEE/dto/LoginRequestDto.java | 13 + .../com/api/UDEE/dto/LoginResponseDto.java | 14 + src/main/java/com/api/UDEE/dto/UserDto.java | 17 + .../exceptions/AddressNotExistsException.java | 5 + .../exceptions/CountryExistsException.java | 4 + .../exceptions/CountryNotExistsException.java | 4 + .../com/api/UDEE/exceptions/ErrorMessage.java | 16 + .../UDEE/filter/JWTAuthorizationFilter.java | 103 ++++++ .../UDEE/repository/AddressRepository.java | 9 + .../api/UDEE/repository/BillRepository.java | 9 + .../api/UDEE/repository/BrandRepository.java | 9 + .../api/UDEE/repository/ClientRepository.java | 9 + .../repository/MeasurementRepository.java | 9 + .../api/UDEE/repository/MeterRepository.java | 9 + .../api/UDEE/repository/ModelRepository.java | 10 + .../api/UDEE/repository/RateRepository.java | 9 + .../api/UDEE/repository/UserRepository.java | 11 + .../UDEE/repository/UsuarioRepository.java | 10 + .../com/api/UDEE/service/AddressService.java | 35 ++ .../com/api/UDEE/service/BillService.java | 37 +++ .../com/api/UDEE/service/BrandService.java | 37 +++ .../com/api/UDEE/service/ClientService.java | 36 ++ .../api/UDEE/service/MeasurementService.java | 36 ++ .../com/api/UDEE/service/MeterService.java | 36 ++ .../com/api/UDEE/service/ModelService.java | 37 +++ .../com/api/UDEE/service/RateService.java | 53 +++ .../com/api/UDEE/service/UserService.java | 41 +++ .../com/api/UDEE/service/UsuarioService.java | 39 +++ src/main/resources/application-dev.yml | 11 + src/main/resources/application.properties | 1 + src/main/resources/application.yml | 4 + .../java/com/api/UDEE/AbstractController.java | 28 ++ .../com/api/UDEE/UdeeApplicationTests.java | 13 + .../UDEE/controller/ModelControllerTest.java | 52 +++ .../controller/PersonaControllerTest.java | 65 ++++ .../UDEE/controller/RateControllerTest.java | 64 ++++ .../controller/UsuarioControllerTest.java | 110 +++++++ .../api/UDEE/service/UsuarioServiceTest.java | 131 ++++++++ .../api/UDEE/utils/LocalDateDeserializer.java | 18 + .../api/UDEE/utils/LocalDateSerializer.java | 17 + .../java/com/api/UDEE/utils/TestUtils.java | 87 +++++ 79 files changed, 3403 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 bdd.sql create mode 100644 modelo.mwb create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 schema.mwb create mode 100644 src/main/java/com/api/UDEE/UdeeApplication.java create mode 100644 src/main/java/com/api/UDEE/Utils/Constants.java create mode 100644 src/main/java/com/api/UDEE/Utils/EntityURLBuilder.java create mode 100644 src/main/java/com/api/UDEE/config/Conf.java create mode 100644 src/main/java/com/api/UDEE/config/SpecsConfiguration.java create mode 100644 src/main/java/com/api/UDEE/controller/AddressController.java create mode 100644 src/main/java/com/api/UDEE/controller/BillController.java create mode 100644 src/main/java/com/api/UDEE/controller/BrandController.java create mode 100644 src/main/java/com/api/UDEE/controller/ClientController.java create mode 100644 src/main/java/com/api/UDEE/controller/MeasurementController.java create mode 100644 src/main/java/com/api/UDEE/controller/MeterController.java create mode 100644 src/main/java/com/api/UDEE/controller/ModelController.java create mode 100644 src/main/java/com/api/UDEE/controller/RateController.java create mode 100644 src/main/java/com/api/UDEE/controller/UsuarioController.java create mode 100644 src/main/java/com/api/UDEE/domain/Address.java create mode 100644 src/main/java/com/api/UDEE/domain/Bill.java create mode 100644 src/main/java/com/api/UDEE/domain/Brand.java create mode 100644 src/main/java/com/api/UDEE/domain/Client.java create mode 100644 src/main/java/com/api/UDEE/domain/Employee.java create mode 100644 src/main/java/com/api/UDEE/domain/Measurement.java create mode 100644 src/main/java/com/api/UDEE/domain/Meter.java create mode 100644 src/main/java/com/api/UDEE/domain/Model.java create mode 100644 src/main/java/com/api/UDEE/domain/PaginationResponse.java create mode 100644 src/main/java/com/api/UDEE/domain/PostResponse.java create mode 100644 src/main/java/com/api/UDEE/domain/Rate.java create mode 100644 src/main/java/com/api/UDEE/domain/TypeUser.java create mode 100644 src/main/java/com/api/UDEE/domain/User.java create mode 100644 src/main/java/com/api/UDEE/domain/Usuario.java create mode 100644 src/main/java/com/api/UDEE/dto/LoginRequestDto.java create mode 100644 src/main/java/com/api/UDEE/dto/LoginResponseDto.java create mode 100644 src/main/java/com/api/UDEE/dto/UserDto.java create mode 100644 src/main/java/com/api/UDEE/exceptions/AddressNotExistsException.java create mode 100644 src/main/java/com/api/UDEE/exceptions/CountryExistsException.java create mode 100644 src/main/java/com/api/UDEE/exceptions/CountryNotExistsException.java create mode 100644 src/main/java/com/api/UDEE/exceptions/ErrorMessage.java create mode 100644 src/main/java/com/api/UDEE/filter/JWTAuthorizationFilter.java create mode 100644 src/main/java/com/api/UDEE/repository/AddressRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/BillRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/BrandRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/ClientRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/MeasurementRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/MeterRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/ModelRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/RateRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/UserRepository.java create mode 100644 src/main/java/com/api/UDEE/repository/UsuarioRepository.java create mode 100644 src/main/java/com/api/UDEE/service/AddressService.java create mode 100644 src/main/java/com/api/UDEE/service/BillService.java create mode 100644 src/main/java/com/api/UDEE/service/BrandService.java create mode 100644 src/main/java/com/api/UDEE/service/ClientService.java create mode 100644 src/main/java/com/api/UDEE/service/MeasurementService.java create mode 100644 src/main/java/com/api/UDEE/service/MeterService.java create mode 100644 src/main/java/com/api/UDEE/service/ModelService.java create mode 100644 src/main/java/com/api/UDEE/service/RateService.java create mode 100644 src/main/java/com/api/UDEE/service/UserService.java create mode 100644 src/main/java/com/api/UDEE/service/UsuarioService.java create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/api/UDEE/AbstractController.java create mode 100644 src/test/java/com/api/UDEE/UdeeApplicationTests.java create mode 100644 src/test/java/com/api/UDEE/controller/ModelControllerTest.java create mode 100644 src/test/java/com/api/UDEE/controller/PersonaControllerTest.java create mode 100644 src/test/java/com/api/UDEE/controller/RateControllerTest.java create mode 100644 src/test/java/com/api/UDEE/controller/UsuarioControllerTest.java create mode 100644 src/test/java/com/api/UDEE/service/UsuarioServiceTest.java create mode 100644 src/test/java/com/api/UDEE/utils/LocalDateDeserializer.java create mode 100644 src/test/java/com/api/UDEE/utils/LocalDateSerializer.java create mode 100644 src/test/java/com/api/UDEE/utils/TestUtils.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^ z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN} zXvC<tOmX83grD8GSo_Lo?%lNfhD#EBgPo z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c> zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$UPDeE_53j${QfKN-0v-HG z(QfyvFNbwPK%^!eIo4ac1;b>c0vyf9}Xby@YY!lkz-UvNp zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^1?H1om1de0Da9M;Q=n zUfn{f87iVb^>Exl*nZ0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7 ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL%u9i`DSM4RdtEH#cW)6}+I-eE< z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI} zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83 zJL7+ncjI9nn!TlS_KYu5vn%f*@qa5F;| zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$ zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~ z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;; z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i z{|Zd9ou-;laGS_x=O}a+ zB||za<795A?_~Q=r=coQ+ZK@@ zId~hWQL<%)fI_WDIX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{ zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2 z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9 zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$>Ed%` z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ} z(||hyyQ)4Z1@wSlT94(-QKqkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5 zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9 z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s> ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2 zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|j>^Qf`A76K%_ubL`Zu?h4`b=IyL>1!=*%!_K)=XC z6d}4R5L+sI50Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I# zlTFFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC& zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$ zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_X%Rl1&Kd~Z(u z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0 z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+ zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl zib0v*{u-?cq}dDGyZ%$XRY=UkQwt2oGu`zQneZh$=^! zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(TpBs; zg$25D!Ry_`8xpS_OJdeo$qh#7U+cepZ??TII7_%AXsT$B z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr zJvD*y6;39&T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m z#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9 zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_ z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu; zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1 z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV zP8^KGZnp`(hVMZ;s=n~3r2y;LTwcJwoBW-(ndU-$03{RD zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx! zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&K zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l z*TYQn^NnUy%Ds}$f^=yQ+BM-a5X4^GHF=%PDrRfm_uqC zh{sKwIu|O0&jWb27;wzg4w5uA@TO_j(1X?8E>5Zfma|Ly7Bklq|s z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE) zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wTyl3!M1q+a zD9W{pCd%il*j&Ft z5H$nENf>>k$;SONGW`qo6`&qKs*T z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==Iu%}HvNliOqVBqG?P2va zQ;kRJ$J6j;+wP9cS za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+MmiaP-eq6_k;)i6_@WSJ zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9 z>&=i7*#tc0`?!==vk>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;< z+bhAbVD*bD=}iU`+PU+SBobTQ%S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8 zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp zF9#myUmO!wCeJIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY z&-&T{egB)&aV$3_aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc zRI+7g2V&k zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#? zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6 zWG18WJaPKMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY? zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IOk=y$dOls{6sRR`I5>|X zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1 zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^ z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC92|Sy0%WWWp={$(am!#l~f^W_oz78HX<0X#7 zp)p1u~M*o9W@O8P{0Qkg@Wa# z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@ zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5 z1^T^eB{_)Y<9)y{-4Rz@9_>;_7h;5D+@QcbF4Wv7hu)s0&==&6u)33 zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj= zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq z6lc*mvU=WS6=v9Lrl}&zRiu_6u;6g%_DU{9b+R z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBFKhx z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wfy?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w zOFTI8gX$ard6fAh&g=u&56%3^-6E2tpk*wx3HSCQ+t7+*iOs zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen- zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r zD?|MetfhdC;^2WG`7MCgs>TKKN=^=!x&Q~BzmQio_^l~LboTNT=I zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V? z;H2SbF>jP^GE(R1@%C==XQ@J=G9lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5dMe+*Gomky_l^54*rzXro$ z>LL)U5Ry>~FJi=*{JDc)_**c)-&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9 zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6 zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qodn#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{ z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(DfinaaWxP<+Y97Z#n#U~V zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L zWjo4l%n51@Kz-n%zeSCD`uB?T%FVk+KBI}=ve zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9 z35uzIrIuo4#WnF^_jcpC@uNNaYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T zAuQ6RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf; zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@ z$FU-;e4W}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*83l9mI zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW zmhHUxd)t%GQ9#ak5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu# zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK zLs>UtkT43LR2G$AOYHVailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB! zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJeTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d> z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec zo<1dyhsVsTw;ZkVcJ_0-h-T3G1W@q)_Q30LNv)W?FbMH+XJ* zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9 zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~* z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgBY_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7>C2m=oghKyxMbFNq#EVLgP0cH3q7H z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_ zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB! z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$ zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$ z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi# zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7RaRnH0Rc_&372={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G z70u6}?zmd?v+{`vCu-53_v5@z)X{oPC@P)iA3jK$`r zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5Ay`RLfY(EiwKkrx%@YN^^XuET;tE zmr-6~I7j!R!KrHu5CWGSChO6deaLWa*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p}O?7`}i7Lsf$-gBkuY*`Zb z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40 zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD~pMgq^KY)T*aBz@DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7 z?^XN}Gf_feGoG~BjUgVa*)O`>lX=$BSR2)uD<9 z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6v$6gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp z@tFGi*CQ~@Yc-?{cwu1 zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm zOxt~Rb3D{dz=nHMcY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb zq6hBGp%O1A+&%2>l0mpaIzbo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5PIso9j1;e zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8 z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R% zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid z9U$XVqxX3P=XCKj0*W>}L0~Em`(vG<>srF8+*kPrw z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#CVjzUZ z!sD2O*;d28zkl))m)YN7HDi^z5IuNo3^w(zy8 zszJG#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=|KshybNB6HgE^(r>HD{*}S}mO>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0 zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(Wlay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_ z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7 zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{ z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_ z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F} zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xUOL2 zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J-> z`(mzDJDM}QPu5i44**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~ zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8 zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD? zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq( z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEyPMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8 zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43? z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz! zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb| zY_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq;ul_ z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQr>3@wA;{EUbjNjlNd6$Mx zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu z2?^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*> z7MQgk6t9OqqXMln?zoMAJcc zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70 zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwfPO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp z4{I|}35=11u$;?|JFBEE*gb;T`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3? zWi-RoXhzRJV0&XE@ACc?+@6?)LQ2XNm4KfalMtsc%4!Fn0rl zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH> z{o!A7f;R-@eK9Vj7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367 zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~ zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435 z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tSOowM{BX@(zawtjl zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7 zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<- zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5ft)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4 zLK<69qcUuniIan-$A1+fR=?@+thwDIXtF1Tks@Br-xY zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!ZRPX`(ZkRGe7~q(4&gEi<$ch`5kQ?*1=GSqkeV z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T zw9p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$ zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{ zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*yONhZG=onhx>t4)RB`r6&TP$n zgmN*)eCqvgriBO-abHQ8ECN0bw?z5Bxpx z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg ziUbIFW#2tj`65~#2V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-j*+=--XGvCq#32Gh(=|qj5F?kmihk{%M&$}udW5)DHK zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{ zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_( zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT# zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O z15y^{4tQoeW9Lu%G&V$90x6F)xN6y_oIn;!Q zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~ zUpeyt7}_nd`t}j9BKqryOha{34erm)RmST)_9Aw)@ zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps|| z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez> zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(@VB)zweR%?IidwJyK5J!STzw&2RFx zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gVhkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_ zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U# ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH7qN}%PKcN|8%9=i)qS5+$L zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW zi7A5Wym*K+V8pkqqO-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~ zp0YJ_P~_a8j= zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x zLW(l}oAg1H`dU+Fv**;qw|ANDSRs>cGqL!Yw^`; zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14 zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55Xy|Kps&Xek*4_r=KDZ z+`TQuv|$l}MWLzA5Ay6Cvsa^7xvwXpy?`w(6vx4XJ zWuf1bVSb#U8{xlY4+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0hn>KZ+h-3=?Y3*R=#!fOX zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy- z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^ zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup zVTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0 zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l> zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G} z2XfmT0(|l!)XJb^E!#3z4oEGIsL(xd; zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1eYtUL9B72{i(ir&ls8g!pD ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)% z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q zMMdd$fH|!s{ zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b z8?9h)kvj9SF!Dr zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?BYlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6 z?sV;|?*=-{M<1+hXoj?@-$y+(^BJ1H~wQ9G8C0#^aEAyhDduNX@haoa=PuPp zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@ z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9 z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`># zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg` z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_x=E1h>T5`DPHz zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i z5>Q(o z=t$gPjgGh0&I7KY#k50V7DJRX<%^X z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-GDY(YkR{9RH(MiCnyRtd!LxXJ75z+?2 zGi@m^+2hKJ5sB1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6 zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY% zOL=GE_ENYxhcyUrEt9XlMNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+ zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQvH~d`MQs86R$|SKXHh zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R; zsUNJf&g&rKpuD0WD@=dDrPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl zrw3Sp151^9=}B})6@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2 zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv)NtmC zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{ zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi% zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@|htC z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM% zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J z^ww~c;ou|iyzpErDtlVU=`8N7JSu>4M z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN; z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~fB zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt* z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q>H_M=fM*L_Op-<_r zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92 zsS&FH(*w`qLIy$doc>RE&A5R?u zzkl1sxX|{*fLpXvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_d7%NEFP6+ zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4- zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z)=5k2tG zM|&Bp5kDTfb#vfuTTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7 zb?A-RKVm_vM5!9?C%qYdfRAw& zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6 z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-# zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-ykqrK?WWZ#a(bglI_-8pq74RK*KfQ z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~ zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1 zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@ z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxomG1#XPmn(?YH@E~_ED+W6mxs%x{%Z<$pW`~ON1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy zOgb-=f}|Hb*LQ$YdWg<(u7x3`PKF)B7ZfZ6;1FrNM63 z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{ zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^I>#vh+LyC;aaVWGbmkENr z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yoO@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^ zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^ z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6& zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1DsOrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhIM0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X% z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~( zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky! zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k zBi=6wE5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)LPvhyN3i4goB$3K8iV7uh zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUYkI9T1cEF;ObfxxI-yNuA=I$dCtz3ey znVkctYD*`fUuZ(57+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@ z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u zm_~}T{HeHj1bAlKl8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4 z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z) zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9% znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O zP%xrP1M6@oYhgo$ZWwrAsYLa4 z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@< zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)woZp~> zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD zc;i;KS+t$koh)E3)w0OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk# zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+niZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^ zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w< zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7 ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I zAL+3opNhJteu&mWQ@kQWPucmiP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5 zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{ zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^ z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3 zO5a`6gwFw(moEzqxh=yJ9M1FTn!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm z%RSLc#p}5_dO{GD=DEFr=Fc% z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;# zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~ zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN#z`nI{UNDRbo-wqa4NEls zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao zUq=TaL$P*IFgJzrGc>j1dDOd zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-f@s?^tmzs_j7t!k zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl- zGd|Cv~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7 zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$ z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q& z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5tK8a+thWE zg4VytZrwcS?7^ zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_ z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^aYa{~m%5#$$+R1? zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI_N*#MMCIq#HFifT zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5 zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$XG8$(&{A zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^2Z)SWo+b`y0gV^iRcZtz5!-05vF z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_ z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s= z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?NI z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P z5gTIzl{3!&(tor^BwZfR8j4k{7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3 zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2 z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+o$@nun`VI1Er7pjq>8V zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d z6h>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4 zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;ZXkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8 z221?Va!l1|Y5X1Y?{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt zA{CcxZLJR|4#{j7k~Tu*jkwz8QA|5G1$Cl895R`Zyp;irp1{KN){kB30O8P1W5;@bG znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2> z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;) z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kDfpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}u3d|eQ8*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo> ze9KdJoiM)RH*SB%^;TAdX-zEjA7@%y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+ zOwDhFvA(E|ER%a^cdh@^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh` zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm zAO&Im2flv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2 zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRDnf1gP{#2>`ffrAC% zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~ zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m( zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM z-{1Wm&p%%#eb_?x7i;bol EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ffdc10e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/bdd.sql b/bdd.sql new file mode 100644 index 0000000..b0e7648 --- /dev/null +++ b/bdd.sql @@ -0,0 +1,198 @@ +create database UDEE; +use UDEE; +drop database UDEE; + +/*Facturas*/ +create table Bills ( + id_bill int not null, + id_user int not null, + id_address int not null, + number_measurer int not null, + measure_start int not null, + measure_end int not null, + consumption_total int not null, + date_time_start datetime,/*son solo fechas*/ + date_time_End datetime,/*son solo fechas*/ + id_rate int not null, + total int not null,/*(Consumo * Tarifa)*/ + CONSTRAINT `PK-Bill` PRIMARY KEY (id_bill), + CONSTRAINT `FK-IdUser` FOREIGN KEY (id_user) references Users(id_user), + CONSTRAINT `FK-IdAddress` FOREIGN KEY (id_address) references Address(id_address), + CONSTRAINT `FK-IdRate` FOREIGN KEY (id_rate) references Rates(id_rate)); + +/*Usuarios*/ +CREATE TABLE Users( + id_user INT NOT NULL AUTO_INCREMENT, + id_client int not null, + username VARCHAR(30) NOT NULL, + password VARCHAR(30) NOT NULL, + CONSTRAINT `PK-User` PRIMARY KEY (id_user), + CONSTRAINT `FK-IdClient` FOREIGN KEY (id_client) references Clients(id_client)); + +/*Clientes*/ +CREATE TABLE Clients( + id_client INT NOT NULL auto_increment, + id_address int not null, + name varchar(30) not null, + last_name varchar(30) not null, + email varchar(40) not null, + constraint `PK-Client` PRIMARY KEY(id_client), + CONSTRAINT `FK-IdAddress` FOREIGN KEY (id_address) references Address(id_address)); + + +/*direcciones*/ +create table Address( + id_address int not null auto_increment, + id_rate int not null, + street varchar(30) not null, + number int not null, + constraint `PK-Address` primary key(id_address), + constraint `FK-Rate` foreign key(id_rate) references Rates(id_rate) +); + +/*tarifas*/ +create table Rates( + id_rate int not null auto_increment, + price float not null, + constraint `PK-Rate` primary key(id_rate) +); + +/*Medidores*/ +create table meters( + id_meter int not null auto_increment, + id_address int not null, + serial_number varchar(30) not null, + password varchar(30) not null, + id_brand int not null, + id_model int not null, + constraint `PK-Meter` primary key(id_meter), + constraint `FK-Brand` foreign key(id_brand) references Brands(id_brand), + constraint `FK-Address` foreign key(id_address) references Address(id_address), + constraint `FK-Model` foreign key(id_model) references Models(id_model) +); + + +/*Mediciones*/ +create table Measurements( + id_measurement int not null auto_increment, + id_bill int not null, + id_meter int not null, + measurement varchar(30) not null, + date date not null, + constraint `PK-Measurement` primary key(id_measurement), + constraint `FK-Bill` foreign key(id_bill) references udee.bills(id_bill), + constraint `FK-Meter` foreign key(id_meter) references udee.meters(id_meter) +); +drop table Measurements; +/*Marcas*/ +create table Brands( + id_brand int not null auto_increment, + name varchar(30)not null, + constraint `PK-Brand` primary key(id_brand) +); + + +/*Modelos*/ +create table Models( + id_model int not null auto_increment, + name varchar(30) not null, + constraint `PK-Model` primary key(id_model) +); + + +select * from Brands; +select * from Models; +select * from Measures; +select * from Rates; +select * from Address; + + + +/* +uen dia + +Tenes las relaciones al revés en muchos csasos + +Por ej : + +Address tiene un id_measurement, no deberia ya que  Measurement +debería relacionarse con meter y meter con address. + +create table Address( + id_address int not null auto_increment, + //id_measure int not null, + id_rate int not null, + street varchar(30) not null, + number int not null, + constraint `PK-Address` primary key(id_address), + //constraint `FK-Measure` foreign key(id_measure) references Measures(id_measure), + constraint `FK-Rate` foreign key(id_rate) references Rates(id_rate) +); + +create table meters( + id_meter int not null auto_increment, + id_address int not null, + serial_number varchar(30) not null, + password varchar(30) not null, + id_brand int not null, + id_model int not null, + constraint `PK-Meter` primary key(id_meter), + constraint `FK-Brand` foreign key(id_brand) references Brands(id_brand), + constraint `FK-Address` foreign key(id_address) references Address(id_address), + constraint `FK-Model` foreign key(id_model) references Models(id_model) +); + +create table Measurements( + id_measurement int not null auto_increment, + id_bill int not null, + id_meter int not null, + measurement varchar(30) not null, + date date not null, + constraint `PK-Measurement` primary key(id_measurement), + constraint `FK-Bill` foreign key(id_bill) references Bills(id_bill), + constraint `FK-Meter` foreign key(id_meter) references Meters(id_meter) +); + + + +En bills también, un measurement debería tener un Bill. + +Es decir 1 BILL -> n MEASUREMENTS, en ese caso la relación siempre +se especifica por la propagación de la clave en el N . + +create table Bills ( + id_bill int not null, + id_user int not null, + id_address int not null, + id_bill int not null, + number_measurer int not null, + measure_start int not null, + measure_end int not null, + consumption_total int not null, + date_time_start datetime,/*son solo fechas + date_time_End datetime,/*son solo fechas + id_rate int not null, + total int not null,/*(Consumo * Tarifa) + CONSTRAINT `PK-Bill` PRIMARY KEY (id_bill), + CONSTRAINT `FK-IdUser` FOREIGN KEY (id_user) references Users(id_user), + CONSTRAINT `FK-IdAddress` FOREIGN KEY (id_address) references Address(id_address), + CONSTRAINT `FK-IdRate` FOREIGN KEY (id_rate) references Rates(id_rate)); + + +Por lo demás , esta bien , revisaría esas cosas, tabla de measurements +/ address / clients / bills y sus relaciones + +*/ + +/* +● Cliente +● Domicilio +● Numero de medidor +● Medición inicial +● Medición final +● Consumo total en Kwh +● Fecha y hora medición inicial +● Fecha y hora medición final +● Tipo de tarifa +● Total a pagar */ + diff --git a/modelo.mwb b/modelo.mwb new file mode 100644 index 0000000000000000000000000000000000000000..d2365bdaf52fbcb0e99a7e7b37d6172d8e94d2f6 GIT binary patch literal 11339 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 nYHn@gX-NiPVMBEIhr{e \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..23bda91 --- /dev/null +++ b/pom.xml @@ -0,0 +1,130 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.4.5 + + + com.api + UDEE + 0.0.1-SNAPSHOT + UDEE + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + 2.4.0 + + + + mysql + mysql-connector-java + 8.0.21 + + + + org.glassfish + javax.el + 3.0.0 + + com.google.code.gson + gson + 2.8.6 + + + org.modelmapper + modelmapper + 2.4.0 + + + io.github.resilience4j + resilience4j-spring-boot2 + 1.6.1 + + + org.springframework.boot + spring-boot-starter-actuator + 2.4.0 + + + org.springframework.boot + spring-boot-starter-aop + 2.4.0 + + + org.apache.commons + commons-lang3 + 3.12.0 + + + org.modelmapper + modelmapper + 2.3.9 + + + net.kaczmarzyk + specification-arg-resolver + 2.6.2 + + + org.springframework.boot + spring-boot-starter-security + + + io.jsonwebtoken + jjwt + 0.9.1 + + + org.glassfish + javax.el + 3.0.0 + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/schema.mwb b/schema.mwb new file mode 100644 index 0000000000000000000000000000000000000000..52ac3e469c2b64502bbc202c9590d06818ce5f44 GIT binary patch literal 28265 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 VnXxgDx;h$~TiF}i{%ZpMzW`)zcsl?9 literal 0 HcmV?d00001 diff --git a/src/main/java/com/api/UDEE/UdeeApplication.java b/src/main/java/com/api/UDEE/UdeeApplication.java new file mode 100644 index 0000000..65e819f --- /dev/null +++ b/src/main/java/com/api/UDEE/UdeeApplication.java @@ -0,0 +1,52 @@ +package com.api.UDEE; + +import com.api.UDEE.filter.JWTAuthorizationFilter; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@SpringBootApplication +public class UdeeApplication { + + public static void main(String[] args) { + SpringApplication.run(UdeeApplication.class, args); + } + + @EnableWebSecurity + @Configuration + static class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + .addFilterAfter(new JWTAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) + .authorizeRequests() + .antMatchers(HttpMethod.POST, "/auth/login").permitAll() + .antMatchers(HttpMethod.POST, "/auth/login2").permitAll() + .antMatchers(HttpMethod.POST, "/users2").permitAll() + .antMatchers(HttpMethod.GET, "/users2").permitAll() + .antMatchers(HttpMethod.POST, "/api/rates").permitAll() + .antMatchers(HttpMethod.POST, "/api/clients").permitAll() + .antMatchers(HttpMethod.POST, "/api/address").permitAll() + .anyRequest().authenticated(); + + /* + http.csrf().disable() + .addFilterAfter(new JWTAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) + .authorizeRequests() + .antMatchers(HttpMethod.POST, "/measurement").permitAll() + .antMatchers(HttpMethod.POST, "/login").permitAll() + .antMatchers(HttpMethod.POST, "/backoffice/login").permitAll() + .antMatchers("/console/**").permitAll() //TODO borrar esta linea + .antMatchers("/tariff/**").hasAuthority(User.TYPE.BLACKOFFICE.name()) + .antMatchers("/clients/**").hasAuthority(User.TYPE.BLACKOFFICE.name()) + .anyRequest().authenticated(); + */ + } + } +} diff --git a/src/main/java/com/api/UDEE/Utils/Constants.java b/src/main/java/com/api/UDEE/Utils/Constants.java new file mode 100644 index 0000000..243d542 --- /dev/null +++ b/src/main/java/com/api/UDEE/Utils/Constants.java @@ -0,0 +1,9 @@ +package com.api.UDEE.Utils; + +public class Constants { + + public static final String JWT_HEADER = "Authorization"; + public static final String JWT_PREFIX = "Bearer "; + public static final String JWT_SECRET = "UDEE"; + +} diff --git a/src/main/java/com/api/UDEE/Utils/EntityURLBuilder.java b/src/main/java/com/api/UDEE/Utils/EntityURLBuilder.java new file mode 100644 index 0000000..0826b75 --- /dev/null +++ b/src/main/java/com/api/UDEE/Utils/EntityURLBuilder.java @@ -0,0 +1,15 @@ +package com.api.UDEE.Utils; + +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +public class EntityURLBuilder { + + public static String buildURL(final String entity, final Integer id) { + return ServletUriComponentsBuilder + .fromCurrentContextPath() + .path("{entity}/{id}") + .buildAndExpand(entity,id) + .toUriString(); + } + +} diff --git a/src/main/java/com/api/UDEE/config/Conf.java b/src/main/java/com/api/UDEE/config/Conf.java new file mode 100644 index 0000000..ff9a20e --- /dev/null +++ b/src/main/java/com/api/UDEE/config/Conf.java @@ -0,0 +1,15 @@ +package com.api.UDEE.config; + +import org.modelmapper.ModelMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class Conf { + @Bean + public ModelMapper modelMapper() { + final ModelMapper modelMapper = new ModelMapper(); + modelMapper.getConfiguration().setSkipNullEnabled(true); + return modelMapper; + } +} diff --git a/src/main/java/com/api/UDEE/config/SpecsConfiguration.java b/src/main/java/com/api/UDEE/config/SpecsConfiguration.java new file mode 100644 index 0000000..6c56570 --- /dev/null +++ b/src/main/java/com/api/UDEE/config/SpecsConfiguration.java @@ -0,0 +1,18 @@ +package com.api.UDEE.config; + +import net.kaczmarzyk.spring.data.jpa.web.SpecificationArgumentResolver; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +public class SpecsConfiguration implements WebMvcConfigurer { + + @Override + public void addArgumentResolvers(List argumentResolverList){ + argumentResolverList.add((new SpecificationArgumentResolver())); + } + +} diff --git a/src/main/java/com/api/UDEE/controller/AddressController.java b/src/main/java/com/api/UDEE/controller/AddressController.java new file mode 100644 index 0000000..78b05f3 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/AddressController.java @@ -0,0 +1,65 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.exceptions.CountryExistsException; +import com.api.UDEE.service.AddressService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/address") +public class AddressController { + + private AddressService addressService; + private ModelMapper modelMapper; + + @Autowired + public AddressController(AddressService addressService, ModelMapper modelMapper){ + this.addressService=addressService; + this.modelMapper=modelMapper; + } + + @PostMapping(consumes = "application/json") + public ResponseEntity newCountry(@RequestBody Address address) throws CountryExistsException { + Address newAddress = addressService.newAddress(address); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newAddress.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping() + public ResponseEntity> allAddress(Pageable pageable) { + Page page = addressService.allAddress(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity
countriesByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Address address = addressService.getAddressById(id); + return ResponseEntity.ok(address); + } + +} diff --git a/src/main/java/com/api/UDEE/controller/BillController.java b/src/main/java/com/api/UDEE/controller/BillController.java new file mode 100644 index 0000000..3b00a1e --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/BillController.java @@ -0,0 +1,67 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.domain.Bill; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.exceptions.CountryExistsException; +import com.api.UDEE.service.AddressService; +import com.api.UDEE.service.BillService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +//@RequestMapping(value = "/api/bills") +public class BillController { + + private BillService billService; + private ModelMapper modelMapper; + + @Autowired + public BillController(BillService billService, ModelMapper modelMapper){ + this.billService=billService; + this.modelMapper=modelMapper; + } + + @PostMapping(value= "/api/bills",consumes = "application/json") + public ResponseEntity newCountry(@RequestBody Bill bill) throws CountryExistsException { + Bill newBill = billService.newBill(bill); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newBill.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping(value = "/api/bills") + public ResponseEntity> allBills(Pageable pageable) { + Page page = billService.allBills(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "/api/bills/{id}", produces = "application/json") + public ResponseEntity billByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Bill bill = billService.getBillById(id); + return ResponseEntity.ok(bill); + } +} diff --git a/src/main/java/com/api/UDEE/controller/BrandController.java b/src/main/java/com/api/UDEE/controller/BrandController.java new file mode 100644 index 0000000..a98feaa --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/BrandController.java @@ -0,0 +1,65 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Brand; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.BrandService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/brands") +public class BrandController { + + private final BrandService brandService; + private ModelMapper modelMapper; + + @Autowired + public BrandController(BrandService brandService,ModelMapper modelMapper){ + this.brandService=brandService; + this.modelMapper=modelMapper; + } + + + @PostMapping(consumes = "application/json") + public ResponseEntity newBrand(@RequestBody Brand brand){ + Brand newBrand = brandService.newBrand(brand); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newBrand.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/brands") + public ResponseEntity> allBrands(Pageable pageable) { + Page page = brandService.allBrands(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity brandByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Brand brand = brandService.getBrandById(id); + return ResponseEntity.ok(brand); + } +} diff --git a/src/main/java/com/api/UDEE/controller/ClientController.java b/src/main/java/com/api/UDEE/controller/ClientController.java new file mode 100644 index 0000000..ceb6b60 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/ClientController.java @@ -0,0 +1,67 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.domain.Client; +import com.api.UDEE.domain.Rate; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.ClientService; +import com.api.UDEE.service.RateService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/clients") +public class ClientController { + + private ClientService clientService; + //private ModelMapper modelMapper; + + @Autowired + public ClientController(ClientService clientService){ + this.clientService=clientService; + //this.modelMapper=modelMapper; + } + + @PostMapping(consumes = "application/json") + public ResponseEntity newClient(@RequestBody Client client){ + Client newClient = clientService.newClient(client); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newClient.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/clients") + public ResponseEntity> allClients(Pageable pageable) { + Page page = clientService.allClients(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity clientByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Client client = clientService.getClientById(id); + return ResponseEntity.ok(client); + } +} diff --git a/src/main/java/com/api/UDEE/controller/MeasurementController.java b/src/main/java/com/api/UDEE/controller/MeasurementController.java new file mode 100644 index 0000000..c5eb8b0 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/MeasurementController.java @@ -0,0 +1,65 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Client; +import com.api.UDEE.domain.Measurement; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.MeasurementService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/measurements") +public class MeasurementController { + + private MeasurementService measurementService; + private ModelMapper modelMapper; + + @Autowired + public MeasurementController(MeasurementService measurementService, ModelMapper modelMapper){ + this.measurementService=measurementService; + this.modelMapper=modelMapper; + } + + @PostMapping(consumes = "application/json") + public ResponseEntity newReading(@RequestBody Measurement reading){ + Measurement newReading = measurementService.newMeasurement(reading); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newReading.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/measurements") + public ResponseEntity> allMeasurements(Pageable pageable) { + Page page = measurementService.allMeasurements(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity readingByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Measurement reading = measurementService.getMeasurementById(id); + return ResponseEntity.ok(reading); + } +} diff --git a/src/main/java/com/api/UDEE/controller/MeterController.java b/src/main/java/com/api/UDEE/controller/MeterController.java new file mode 100644 index 0000000..601b950 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/MeterController.java @@ -0,0 +1,66 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Meter; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.exceptions.CountryExistsException; +import com.api.UDEE.service.MeterService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/meters") +public class MeterController { + + private MeterService meterService; + private ModelMapper modelMapper; + + @Autowired + public MeterController(MeterService meterService, ModelMapper modelMapper){ + this.meterService=meterService; + this.modelMapper=modelMapper; + } + + @PostMapping(consumes = "application/json") + public ResponseEntity newCountry(@RequestBody Meter meter) throws CountryExistsException { + Meter newMeasure = meterService.newMeter(meter); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newMeasure.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/meters") + public ResponseEntity> allMeters(Pageable pageable) { + Page page = meterService.allMeter(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity measureByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Meter measure = meterService.getMeterById(id); + return ResponseEntity.ok(measure); + } +} diff --git a/src/main/java/com/api/UDEE/controller/ModelController.java b/src/main/java/com/api/UDEE/controller/ModelController.java new file mode 100644 index 0000000..ac67e9d --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/ModelController.java @@ -0,0 +1,68 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.domain.Model; +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.ModelService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "/api/models") +public class ModelController { + + private ModelService modelService; + //private ModelMapper modelMapper; + + @Autowired + public ModelController(ModelService modelService){ + this.modelService=modelService; + //this.modelMapper=modelMapper; + } + + //@PreAuthorize(value = "hasAuthority(TypeUser.CLIENT)") + @PreAuthorize(value = "hasAuthority('CLIENT')") + @PostMapping(consumes = "application/json") + public ResponseEntity newModel(@RequestBody Model model){ + Model newModel = modelService.newModel(model); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newModel.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/models") + public ResponseEntity> allModels(Pageable pageable) { + Page page = modelService.allModels(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity ModelByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Model model = modelService.getModelById(id); + return ResponseEntity.ok(model); + } +} diff --git a/src/main/java/com/api/UDEE/controller/RateController.java b/src/main/java/com/api/UDEE/controller/RateController.java new file mode 100644 index 0000000..cef6814 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/RateController.java @@ -0,0 +1,63 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.PaginationResponse; +import com.api.UDEE.domain.PostResponse; +import com.api.UDEE.domain.Rate; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.RateService; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.data.domain.Sort.Order; + +import java.net.URI; +import java.util.List; + +@RestController +@RequestMapping(value = "api/rates") +public class RateController { + + private RateService rateService; + //private ModelMapper modelMapper; + + @Autowired + public RateController(RateService rateService){ + this.rateService=rateService; + //this.modelMapper=modelMapper; + } + + + @PostMapping + public PostResponse newRate(@RequestBody Rate rate) { + return rateService.newRate(rate); + } + + @GetMapping("/rates") + public ResponseEntity> allRates(Pageable pageable) { + Page page = rateService.allRates(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "{id}", produces = "application/json") + public ResponseEntity RateByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Rate rate= rateService.getRateById(id); + return ResponseEntity.ok(rate); + } +} diff --git a/src/main/java/com/api/UDEE/controller/UsuarioController.java b/src/main/java/com/api/UDEE/controller/UsuarioController.java new file mode 100644 index 0000000..46f5bb1 --- /dev/null +++ b/src/main/java/com/api/UDEE/controller/UsuarioController.java @@ -0,0 +1,117 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.TypeUser; +import com.api.UDEE.domain.User; +import com.api.UDEE.domain.Usuario; +import com.api.UDEE.dto.LoginRequestDto; +import com.api.UDEE.dto.LoginResponseDto; +import com.api.UDEE.dto.UserDto; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.service.UsuarioService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import lombok.extern.slf4j.Slf4j; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +import static com.api.UDEE.Utils.Constants.JWT_SECRET; + +@Slf4j +@RestController +public class UsuarioController { + + private final UsuarioService usuarioService; + private final ModelMapper modelMapper; + private final ObjectMapper objectMapper; + + @Autowired + public UsuarioController(UsuarioService usuarioService,ModelMapper modelMapper, ObjectMapper objectMapper){ + this.usuarioService=usuarioService; + this.modelMapper=modelMapper; + this.objectMapper=objectMapper; + } + + private String generateToken(UserDto userDto, TypeUser typeUser) { + try { + String authRole; + if(typeUser.equals("CLIENT")) { + authRole="CLIENT"; + } + else { + authRole="EMPLOYEE"; + } + List grantedAuthorities = AuthorityUtils.commaSeparatedStringToAuthorityList(authRole); + String token = Jwts + .builder() + .setId("JWT") + .setSubject(userDto.getUsername()) + .claim("user", objectMapper.writeValueAsString(userDto)) + .claim("authorities",grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList())) + .setIssuedAt(new Date(System.currentTimeMillis())) + .setExpiration(new Date(System.currentTimeMillis() + 1800000)) + .signWith(SignatureAlgorithm.HS512, JWT_SECRET.getBytes()).compact(); + return token; + } catch(Exception e) { + return "dummy"; + } + } + + @PostMapping(value = "auth/login2") + public ResponseEntity login(@RequestBody LoginRequestDto loginRequestDto) { + //log.info(loginRequestDto.toString()); + Usuario user = usuarioService.login(loginRequestDto.getUsername(), loginRequestDto.getPassword()); + if (user!=null){ + UserDto dto = modelMapper.map(user, UserDto.class); + return ResponseEntity.ok(LoginResponseDto.builder().token(this.generateToken(dto,user.getTypeUser())).build()); + } else { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); + } + } + + @PostMapping(value = "users2",consumes = "application/json") + public ResponseEntity newClient(@RequestBody Usuario user){ + Usuario newUser = usuarioService.newUser(user); + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(newUser.getId()) + .toUri(); + return ResponseEntity.created(location).build(); + } + + @GetMapping("/users2") + public ResponseEntity> allUsers(Pageable pageable) { + Page page = usuarioService.allUsers(pageable); + return response(page); + } + + private ResponseEntity response(Page page) { + + HttpStatus httpStatus = page.getContent().isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK; + return ResponseEntity. + status(httpStatus). + header("X-Total-Count", Long.toString(page.getTotalElements())) + .header("X-Total-Pages", Long.toString(page.getTotalPages())) + .body(page.getContent()); + } + + @GetMapping(value = "/users2/{id}", produces = "application/json") + public ResponseEntity userByCode(@PathVariable("id") Integer id) throws AddressNotExistsException { + Usuario user = usuarioService.getUserById(id); + return ResponseEntity.ok(user); + } +} diff --git a/src/main/java/com/api/UDEE/domain/Address.java b/src/main/java/com/api/UDEE/domain/Address.java new file mode 100644 index 0000000..06fd9a9 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Address.java @@ -0,0 +1,40 @@ +package com.api.UDEE.domain; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "address") +public class Address { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "address_id") + private Integer id; + + @OneToOne + @JoinColumn(name = "rate_id") + private Rate rate; + + /*@ManyToOne(fetch = FetchType.LAZY) + @JsonBackReference(value="client_id") + @JoinColumn(name="client_id") + private Client client;*/ + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "id_user") + private User userClient; + + @Column(name = "street") + private String street; + + @Column(name = "number") + private Integer number; + +} diff --git a/src/main/java/com/api/UDEE/domain/Bill.java b/src/main/java/com/api/UDEE/domain/Bill.java new file mode 100644 index 0000000..f199fc7 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Bill.java @@ -0,0 +1,45 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Entity +@Data +@AllArgsConstructor +@NoArgsConstructor +@Table (name = "bills") +public class Bill { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_bill") + private Integer id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id_user") + private User userClient; + + @OneToOne + @JoinColumn(name = "id_address") + private Address address; + + private Integer number_measurer; + + private Integer measure_start; + + private Integer measure_end; + + private Integer consumption_total; + + private String date_time_start; + + private String date_time_end; + + @OneToOne + @JoinColumn(name = "rate_id") + private Rate rate; + + private Integer total; +} diff --git a/src/main/java/com/api/UDEE/domain/Brand.java b/src/main/java/com/api/UDEE/domain/Brand.java new file mode 100644 index 0000000..6d0b533 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Brand.java @@ -0,0 +1,29 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Builder +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "brands") +public class Brand { + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_brand") + private Integer id; + /* + * @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id;*/ + + private String name; +} diff --git a/src/main/java/com/api/UDEE/domain/Client.java b/src/main/java/com/api/UDEE/domain/Client.java new file mode 100644 index 0000000..c5f52b9 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Client.java @@ -0,0 +1,36 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "clients") +public class Client { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "client_id") + private Integer id; + + + /* + @OneToMany(mappedBy = "client") + private List
addressList; + *@OneToMany(mappedBy = "id") + private List
address; + * */ + + private String name; + + private String last_name; + + private String email; + +} diff --git a/src/main/java/com/api/UDEE/domain/Employee.java b/src/main/java/com/api/UDEE/domain/Employee.java new file mode 100644 index 0000000..69621a2 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Employee.java @@ -0,0 +1,26 @@ +package com.api.UDEE.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.List; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "employees") +public class Employee { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_employee") + private Integer id; + + private String name; + + private String last_name; + + private String email; + +} diff --git a/src/main/java/com/api/UDEE/domain/Measurement.java b/src/main/java/com/api/UDEE/domain/Measurement.java new file mode 100644 index 0000000..095ced2 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Measurement.java @@ -0,0 +1,32 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@Entity +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "measurements") + +public class Measurement { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_measurement") + private Integer id; + + @OneToOne + private Bill bill; + + @OneToOne + @JoinColumn(name = "id_meter") + private Meter meter; + + private String measurement; + + private String date; + +} diff --git a/src/main/java/com/api/UDEE/domain/Meter.java b/src/main/java/com/api/UDEE/domain/Meter.java new file mode 100644 index 0000000..f2b7b0f --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Meter.java @@ -0,0 +1,37 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Builder +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "meters") +public class Meter { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_meter") + private Integer id; + + @OneToOne + @JoinColumn(name = "id_address") + private Address address; + + private String serial_number; + + private String password; + + @OneToOne + @JoinColumn(name = "id_brand") + private Brand brand; + + @OneToOne + @JoinColumn(name = "id_model") + private Model model; +} diff --git a/src/main/java/com/api/UDEE/domain/Model.java b/src/main/java/com/api/UDEE/domain/Model.java new file mode 100644 index 0000000..6b8eb3e --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Model.java @@ -0,0 +1,24 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@Builder +@Entity +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "models") +public class Model { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_model") + private Integer id; + + @Column(name = "name") + private String name; +} diff --git a/src/main/java/com/api/UDEE/domain/PaginationResponse.java b/src/main/java/com/api/UDEE/domain/PaginationResponse.java new file mode 100644 index 0000000..2443bc6 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/PaginationResponse.java @@ -0,0 +1,17 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@AllArgsConstructor +public class PaginationResponse implements Serializable { + + private List response; + private int totalPages; + private Long totalElements; + +} diff --git a/src/main/java/com/api/UDEE/domain/PostResponse.java b/src/main/java/com/api/UDEE/domain/PostResponse.java new file mode 100644 index 0000000..cc34ec1 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/PostResponse.java @@ -0,0 +1,14 @@ +package com.api.UDEE.domain; + +import lombok.Builder; +import lombok.Data; +import org.springframework.http.HttpStatus; + +@Data +@Builder +public class PostResponse { + + private String url; + private HttpStatus status; + +} diff --git a/src/main/java/com/api/UDEE/domain/Rate.java b/src/main/java/com/api/UDEE/domain/Rate.java new file mode 100644 index 0000000..b3007a0 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Rate.java @@ -0,0 +1,23 @@ +package com.api.UDEE.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "rates") +public class Rate { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "rate_id") + private Integer id; + + @Column(name = "price") + private Float price; +} diff --git a/src/main/java/com/api/UDEE/domain/TypeUser.java b/src/main/java/com/api/UDEE/domain/TypeUser.java new file mode 100644 index 0000000..145c7b6 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/TypeUser.java @@ -0,0 +1,17 @@ +package com.api.UDEE.domain; + +public enum TypeUser { + + EMPLOYEE("EMPLOYEE"), + CLIENT("CLIENT"); + + private String name; + + TypeUser (String name){ + this.name=name; + } + + public String getName(){ + return this.name; + } +} diff --git a/src/main/java/com/api/UDEE/domain/User.java b/src/main/java/com/api/UDEE/domain/User.java new file mode 100644 index 0000000..fe74b6c --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/User.java @@ -0,0 +1,29 @@ +package com.api.UDEE.domain; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.AccessType; + +import javax.persistence.*; + +@Entity +@Data +@AllArgsConstructor +@NoArgsConstructor + + +@Table (name = "users") +public class User { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_user") + private Integer id; + + private String username; + + private String password; + +} diff --git a/src/main/java/com/api/UDEE/domain/Usuario.java b/src/main/java/com/api/UDEE/domain/Usuario.java new file mode 100644 index 0000000..9ce1297 --- /dev/null +++ b/src/main/java/com/api/UDEE/domain/Usuario.java @@ -0,0 +1,52 @@ +package com.api.UDEE.domain; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.AccessType; + +import javax.persistence.*; +import java.util.List; + +@Builder +@Entity +@Data +@AllArgsConstructor +@NoArgsConstructor + +@Table (name = "usuarios") +public class Usuario { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_user") + private Integer id; + + private String username; + + private String password; + + private String name; + + private String last_name; + + private String email; + + //@ManyToOne() + //@JoinColumn(name = "roles_id") + @Column(name = "user_type") + @AccessType(AccessType.Type.PROPERTY) + TypeUser typeUser; + + @JsonIgnore + @OneToMany(mappedBy = "userClient", cascade = CascadeType.ALL) + @Column(name = "id_bill") + private List billList; + + @JsonIgnore + @OneToMany(mappedBy = "userClient",fetch = FetchType.EAGER) + @Column(name = "address_id") + private List
addressList; + +} diff --git a/src/main/java/com/api/UDEE/dto/LoginRequestDto.java b/src/main/java/com/api/UDEE/dto/LoginRequestDto.java new file mode 100644 index 0000000..8f804f6 --- /dev/null +++ b/src/main/java/com/api/UDEE/dto/LoginRequestDto.java @@ -0,0 +1,13 @@ +package com.api.UDEE.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LoginRequestDto { + String username; + String password; +} diff --git a/src/main/java/com/api/UDEE/dto/LoginResponseDto.java b/src/main/java/com/api/UDEE/dto/LoginResponseDto.java new file mode 100644 index 0000000..22467a9 --- /dev/null +++ b/src/main/java/com/api/UDEE/dto/LoginResponseDto.java @@ -0,0 +1,14 @@ +package com.api.UDEE.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class LoginResponseDto { + String token; +} diff --git a/src/main/java/com/api/UDEE/dto/UserDto.java b/src/main/java/com/api/UDEE/dto/UserDto.java new file mode 100644 index 0000000..365de3b --- /dev/null +++ b/src/main/java/com/api/UDEE/dto/UserDto.java @@ -0,0 +1,17 @@ +package com.api.UDEE.dto; + +import com.api.UDEE.domain.TypeUser; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor + +public class UserDto { + int id; + String username; +} diff --git a/src/main/java/com/api/UDEE/exceptions/AddressNotExistsException.java b/src/main/java/com/api/UDEE/exceptions/AddressNotExistsException.java new file mode 100644 index 0000000..c1abc14 --- /dev/null +++ b/src/main/java/com/api/UDEE/exceptions/AddressNotExistsException.java @@ -0,0 +1,5 @@ +package com.api.UDEE.exceptions; + +public class AddressNotExistsException extends Throwable { + +} diff --git a/src/main/java/com/api/UDEE/exceptions/CountryExistsException.java b/src/main/java/com/api/UDEE/exceptions/CountryExistsException.java new file mode 100644 index 0000000..cda694f --- /dev/null +++ b/src/main/java/com/api/UDEE/exceptions/CountryExistsException.java @@ -0,0 +1,4 @@ +package com.api.UDEE.exceptions; + +public class CountryExistsException extends Throwable { +} diff --git a/src/main/java/com/api/UDEE/exceptions/CountryNotExistsException.java b/src/main/java/com/api/UDEE/exceptions/CountryNotExistsException.java new file mode 100644 index 0000000..c409f58 --- /dev/null +++ b/src/main/java/com/api/UDEE/exceptions/CountryNotExistsException.java @@ -0,0 +1,4 @@ +package com.api.UDEE.exceptions; + +public class CountryNotExistsException extends Throwable { +} diff --git a/src/main/java/com/api/UDEE/exceptions/ErrorMessage.java b/src/main/java/com/api/UDEE/exceptions/ErrorMessage.java new file mode 100644 index 0000000..71ad16e --- /dev/null +++ b/src/main/java/com/api/UDEE/exceptions/ErrorMessage.java @@ -0,0 +1,16 @@ +package com.api.UDEE.exceptions; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@Data +@NoArgsConstructor +@Builder +public class ErrorMessage { + String code; + String message; +} diff --git a/src/main/java/com/api/UDEE/filter/JWTAuthorizationFilter.java b/src/main/java/com/api/UDEE/filter/JWTAuthorizationFilter.java new file mode 100644 index 0000000..b67c9da --- /dev/null +++ b/src/main/java/com/api/UDEE/filter/JWTAuthorizationFilter.java @@ -0,0 +1,103 @@ +package com.api.UDEE.filter; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.api.UDEE.dto.UserDto; +import io.jsonwebtoken.*; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; + +;import static com.api.UDEE.Utils.Constants.*; + + +public class JWTAuthorizationFilter extends OncePerRequestFilter { + + ObjectMapper objectMapper; + + public JWTAuthorizationFilter() { + this.objectMapper = new ObjectMapper(); + } + + /** + * Internal JWT Filter to check if the request is valid + * + * @param request + * @param response + * @param chain + * @throws ServletException + * @throws IOException + */ + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { + try { + if (containsJWT(request, response)) { + Claims claims = validateToken(request); + if (claims.get("user") != null) { + setUpSpringAuthentication(claims); + } else { + SecurityContextHolder.clearContext(); + } + } else { + SecurityContextHolder.clearContext(); + } + chain.doFilter(request, response); + } catch (ExpiredJwtException | UnsupportedJwtException | MalformedJwtException e) { + response.setStatus(HttpServletResponse.SC_FORBIDDEN); + ((HttpServletResponse) response).sendError(HttpServletResponse.SC_FORBIDDEN, e.getMessage()); + return; + } + } + + + + /** + * Method to validate if the token is valid + * + * @param request + * @return + */ + + private Claims validateToken(HttpServletRequest request) { + String jwtToken = request.getHeader(JWT_HEADER).replace(JWT_PREFIX, ""); + return Jwts.parser().setSigningKey(JWT_SECRET.getBytes()).parseClaimsJws(jwtToken).getBody(); + } + + /** + * Authentication Method to authorize through Spring + * + * @param claims + */ + private void setUpSpringAuthentication(Claims claims) { + try { + List authorities = (List) claims.get("authorities"); + String userClaim = (String) claims.get("user"); + UserDto user = objectMapper.readValue(userClaim, UserDto.class); + UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(user, null, + authorities.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList())); + SecurityContextHolder.getContext().setAuthentication(auth); + } catch (JsonProcessingException e) { + SecurityContextHolder.clearContext(); + } + + + } + + private boolean containsJWT(HttpServletRequest request, HttpServletResponse res) { + String authenticationHeader = request.getHeader(JWT_HEADER); + if (authenticationHeader == null || !authenticationHeader.startsWith(JWT_PREFIX)) + return false; + return true; + } + +} \ No newline at end of file diff --git a/src/main/java/com/api/UDEE/repository/AddressRepository.java b/src/main/java/com/api/UDEE/repository/AddressRepository.java new file mode 100644 index 0000000..719b630 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/AddressRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Address; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AddressRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/BillRepository.java b/src/main/java/com/api/UDEE/repository/BillRepository.java new file mode 100644 index 0000000..be915ed --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/BillRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Bill; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface BillRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/BrandRepository.java b/src/main/java/com/api/UDEE/repository/BrandRepository.java new file mode 100644 index 0000000..d63c642 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/BrandRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Brand; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface BrandRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/ClientRepository.java b/src/main/java/com/api/UDEE/repository/ClientRepository.java new file mode 100644 index 0000000..2816947 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/ClientRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Client; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ClientRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/MeasurementRepository.java b/src/main/java/com/api/UDEE/repository/MeasurementRepository.java new file mode 100644 index 0000000..b859ce9 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/MeasurementRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Measurement; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MeasurementRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/MeterRepository.java b/src/main/java/com/api/UDEE/repository/MeterRepository.java new file mode 100644 index 0000000..82d71df --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/MeterRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Meter; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MeterRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/ModelRepository.java b/src/main/java/com/api/UDEE/repository/ModelRepository.java new file mode 100644 index 0000000..ecd839a --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/ModelRepository.java @@ -0,0 +1,10 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Model; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ModelRepository extends JpaRepository { + +} diff --git a/src/main/java/com/api/UDEE/repository/RateRepository.java b/src/main/java/com/api/UDEE/repository/RateRepository.java new file mode 100644 index 0000000..f314149 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/RateRepository.java @@ -0,0 +1,9 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Rate; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface RateRepository extends JpaRepository { +} diff --git a/src/main/java/com/api/UDEE/repository/UserRepository.java b/src/main/java/com/api/UDEE/repository/UserRepository.java new file mode 100644 index 0000000..5eb0ab8 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/UserRepository.java @@ -0,0 +1,11 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserRepository extends JpaRepository { + + User findByUsernameAndPassword(String username, String password); +} diff --git a/src/main/java/com/api/UDEE/repository/UsuarioRepository.java b/src/main/java/com/api/UDEE/repository/UsuarioRepository.java new file mode 100644 index 0000000..96bbd73 --- /dev/null +++ b/src/main/java/com/api/UDEE/repository/UsuarioRepository.java @@ -0,0 +1,10 @@ +package com.api.UDEE.repository; + +import com.api.UDEE.domain.Usuario; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UsuarioRepository extends JpaRepository { + Usuario findByUsernameAndPassword(String username, String password); +} diff --git a/src/main/java/com/api/UDEE/service/AddressService.java b/src/main/java/com/api/UDEE/service/AddressService.java new file mode 100644 index 0000000..d9868c5 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/AddressService.java @@ -0,0 +1,35 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.AddressRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class AddressService { + private final AddressRepository addressRepository; + @Autowired + public AddressService(AddressRepository addressRepository){ + this.addressRepository=addressRepository; + } + + public Address getAddressById(Integer id) throws AddressNotExistsException { + return addressRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Address newAddress(Address address) { + if (!addressRepository.existsById(address.getId())) { + return addressRepository.save(address); + } + else{ + return null; + } + } + + public Page allAddress(Pageable pageable) { + return addressRepository.findAll(pageable); + } +} diff --git a/src/main/java/com/api/UDEE/service/BillService.java b/src/main/java/com/api/UDEE/service/BillService.java new file mode 100644 index 0000000..36f293a --- /dev/null +++ b/src/main/java/com/api/UDEE/service/BillService.java @@ -0,0 +1,37 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Address; +import com.api.UDEE.domain.Bill; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.BillRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class BillService { + private final BillRepository billRepository; + @Autowired + public BillService(BillRepository billRepository){ + this.billRepository=billRepository; + } + + public Bill getBillById(Integer id) throws AddressNotExistsException { + return billRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Bill newBill(Bill bill) { + if (!billRepository.existsById(bill.getId())) { + return billRepository.save(bill); + } + else{ + return null; + } + } + + public Page allBills(Pageable pageable) { + return billRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/BrandService.java b/src/main/java/com/api/UDEE/service/BrandService.java new file mode 100644 index 0000000..e122b39 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/BrandService.java @@ -0,0 +1,37 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Bill; +import com.api.UDEE.domain.Brand; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.BrandRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class BrandService { + private final BrandRepository brandRepository; + @Autowired + public BrandService(BrandRepository brandRepository){ + this.brandRepository=brandRepository; + } + + public Brand getBrandById(Integer id) throws AddressNotExistsException { + return brandRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Brand newBrand(Brand brand) { + //if (!brandRepository.existsById(brand.getId())) { + return brandRepository.save(brand); + /*} + else{ + return null; + }*/ + } + + public Page allBrands(Pageable pageable) { + return brandRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/ClientService.java b/src/main/java/com/api/UDEE/service/ClientService.java new file mode 100644 index 0000000..16246d7 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/ClientService.java @@ -0,0 +1,36 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Client; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.ClientRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class ClientService { + private final ClientRepository clientRepository; + @Autowired + public ClientService(ClientRepository clientRepository){ + this.clientRepository=clientRepository; + } + + public Client getClientById(Integer id) throws AddressNotExistsException { + return clientRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Client newClient(Client client) { + if (!clientRepository.existsById(client.getId())) { + return clientRepository.save(client); + } + else{ + return null; + } + } + + public Page allClients(Pageable pageable) { + return clientRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/MeasurementService.java b/src/main/java/com/api/UDEE/service/MeasurementService.java new file mode 100644 index 0000000..6c558e7 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/MeasurementService.java @@ -0,0 +1,36 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Measurement; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.MeasurementRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class MeasurementService { + private final MeasurementRepository measurementRepository; + @Autowired + public MeasurementService(MeasurementRepository measurementRepository){ + this.measurementRepository=measurementRepository; + } + + public Measurement getMeasurementById(Integer id) throws AddressNotExistsException { + return measurementRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Measurement newMeasurement(Measurement reading) { + if (!measurementRepository.existsById(reading.getId())) { + return measurementRepository.save(reading); + } + else{ + return null; + } + } + + public Page allMeasurements(Pageable pageable) { + return measurementRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/MeterService.java b/src/main/java/com/api/UDEE/service/MeterService.java new file mode 100644 index 0000000..8cb84a0 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/MeterService.java @@ -0,0 +1,36 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Meter; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.exceptions.CountryExistsException; +import com.api.UDEE.repository.MeterRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class MeterService { + private final MeterRepository meterRepository; + + @Autowired + public MeterService(MeterRepository meterRepository){ + this.meterRepository=meterRepository; + } + + public Meter getMeterById(Integer id) throws AddressNotExistsException { + return meterRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Meter newMeter(Meter meter) throws CountryExistsException { + if (!meterRepository.existsById(meter.getId())) { + return meterRepository.save(meter); + } + else{ + throw new CountryExistsException(); + } + } + public Page allMeter(Pageable pageable) { + return meterRepository.findAll(pageable); + } +} diff --git a/src/main/java/com/api/UDEE/service/ModelService.java b/src/main/java/com/api/UDEE/service/ModelService.java new file mode 100644 index 0000000..286ea2f --- /dev/null +++ b/src/main/java/com/api/UDEE/service/ModelService.java @@ -0,0 +1,37 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Client; +import com.api.UDEE.domain.Model; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.ModelRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class ModelService { + private final ModelRepository modelRepository; + @Autowired + public ModelService(ModelRepository modelRepository){ + this.modelRepository=modelRepository; + } + + public Model getModelById(Integer id) throws AddressNotExistsException { + return modelRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Model newModel(Model model) { + //if (!modelRepository.existsById(model.getId())) { + return modelRepository.save(model); + /*} + else{ + return null; + }*/ + } + + public Page allModels(Pageable pageable) { + return modelRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/RateService.java b/src/main/java/com/api/UDEE/service/RateService.java new file mode 100644 index 0000000..8aab3bb --- /dev/null +++ b/src/main/java/com/api/UDEE/service/RateService.java @@ -0,0 +1,53 @@ +package com.api.UDEE.service; + +import com.api.UDEE.Utils.EntityURLBuilder; +import com.api.UDEE.domain.Client; +import com.api.UDEE.domain.PaginationResponse; +import com.api.UDEE.domain.PostResponse; +import com.api.UDEE.domain.Rate; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.RateRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +public class RateService { + private final RateRepository rateRepository; + private static final String RATE_PATH = "rate"; + @Autowired + public RateService(RateRepository rateRepository){ + this.rateRepository=rateRepository; + } + + public Rate getRateById(Integer id) throws AddressNotExistsException { + return rateRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + /* + public Rate newRate(Rate rate) { + if (!rateRepository.existsById(rate.getId())) { + return rateRepository.save(rate); + } + else{ + return null; + } + }*/ + + public PostResponse newRate(Rate rate) { + Rate r = rateRepository.save(rate); + return PostResponse + .builder() + .status(HttpStatus.CREATED) + .url(EntityURLBuilder.buildURL(RATE_PATH, r.getId())) + .build(); + } + + public Page allRates(Pageable pageable){ + return this.rateRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/UserService.java b/src/main/java/com/api/UDEE/service/UserService.java new file mode 100644 index 0000000..498bbaf --- /dev/null +++ b/src/main/java/com/api/UDEE/service/UserService.java @@ -0,0 +1,41 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.User; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.UserRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + private final UserRepository userRepository; + + @Autowired + public UserService(UserRepository userRepository){ + this.userRepository=userRepository; + } + + public User login(String username, String password) { + return userRepository.findByUsernameAndPassword(username, password); + } + + public User getUserById(Integer id) throws AddressNotExistsException { + return userRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public User newUser(User user) { + if (!userRepository.existsById(user.getId())) { + return userRepository.save(user); + } + else{ + return null; + } + } + + public Page allUsers(Pageable pageable) { + return userRepository.findAll(pageable); + } + +} diff --git a/src/main/java/com/api/UDEE/service/UsuarioService.java b/src/main/java/com/api/UDEE/service/UsuarioService.java new file mode 100644 index 0000000..27b7f95 --- /dev/null +++ b/src/main/java/com/api/UDEE/service/UsuarioService.java @@ -0,0 +1,39 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Usuario; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.UsuarioRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class UsuarioService { + + private final UsuarioRepository usuarioRepository; + + @Autowired + public UsuarioService(UsuarioRepository usuarioRepository){ + this.usuarioRepository=usuarioRepository; + } + + public Usuario login(String username, String password) { + return Optional.ofNullable(usuarioRepository.findByUsernameAndPassword(username, password)).orElseThrow(() -> new RuntimeException("User does not exists")); + } + + public Usuario getUserById(Integer id) throws AddressNotExistsException { + return usuarioRepository.findById(id).orElseThrow(AddressNotExistsException::new); + } + + public Usuario newUser(Usuario user) { + return usuarioRepository.save(user); + } + + public Page allUsers(Pageable pageable) { + return usuarioRepository.findAll(pageable); + } + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..230c423 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +Spring: + Datasource: + url: jdbc:mysql://localhost:3306/UDEE?serverTimezone=UTC + username: root + + jpa: + hibernate: + ddl-auto: none + dialect: org.hibernate.dialect.MySQL8Dialect + driverClassName: com.mysql.cj.jdbc.Drive + database: mysql diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..ad9a171 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,4 @@ +spring: + profiles: + active: dev + diff --git a/src/test/java/com/api/UDEE/AbstractController.java b/src/test/java/com/api/UDEE/AbstractController.java new file mode 100644 index 0000000..daf8d07 --- /dev/null +++ b/src/test/java/com/api/UDEE/AbstractController.java @@ -0,0 +1,28 @@ +package com.api.UDEE; + +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +@AutoConfigureWebMvc +@AutoConfigureMockMvc +@ContextConfiguration +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public abstract class AbstractController { + + @Autowired + private WebApplicationContext webApplicationContext; + + public MockMvc mockMvc; + + protected MockMvc givenController() { + return MockMvcBuilders.webAppContextSetup(this.webApplicationContext) + .build(); + } + +} diff --git a/src/test/java/com/api/UDEE/UdeeApplicationTests.java b/src/test/java/com/api/UDEE/UdeeApplicationTests.java new file mode 100644 index 0000000..ee8af53 --- /dev/null +++ b/src/test/java/com/api/UDEE/UdeeApplicationTests.java @@ -0,0 +1,13 @@ +package com.api.UDEE; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class UdeeApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/api/UDEE/controller/ModelControllerTest.java b/src/test/java/com/api/UDEE/controller/ModelControllerTest.java new file mode 100644 index 0000000..0f61910 --- /dev/null +++ b/src/test/java/com/api/UDEE/controller/ModelControllerTest.java @@ -0,0 +1,52 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.AbstractController; +import com.api.UDEE.service.ModelService; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import static com.api.UDEE.utils.TestUtils.aModelJSON; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest(classes = ModelController.class) +public class ModelControllerTest extends AbstractController { + @MockBean + private ModelService modelService; + + @Test + public void allModel() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/api/models") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + @Test + public void getModelById() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/api/models/1") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + @Test + public void newModel() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .post("/api/models") + .contentType(MediaType.APPLICATION_JSON) + .content(aModelJSON())) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } +} diff --git a/src/test/java/com/api/UDEE/controller/PersonaControllerTest.java b/src/test/java/com/api/UDEE/controller/PersonaControllerTest.java new file mode 100644 index 0000000..60bed8c --- /dev/null +++ b/src/test/java/com/api/UDEE/controller/PersonaControllerTest.java @@ -0,0 +1,65 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.AbstractController; +import com.api.UDEE.service.ClientService; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import static com.api.UDEE.utils.TestUtils.aRateJSON; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@SpringBootTest(classes = ClientController.class) +public class PersonaControllerTest extends AbstractController { + + @MockBean + private ClientService clientService; + + @Test + public void allClients() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/api/clients") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + @Test + public void getClientById() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/clients/1") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } +/* + @Test + public void newClient() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .post("/clients") + .contentType(MediaType.APPLICATION_JSON) + .content(aClientJSON())) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } +*/ + @Test + public void addPersonBadRequest() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .post("/clients") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isBadRequest()); + + assertEquals(HttpStatus.BAD_REQUEST.value(), resultActions.andReturn().getResponse().getStatus()); + } + +} diff --git a/src/test/java/com/api/UDEE/controller/RateControllerTest.java b/src/test/java/com/api/UDEE/controller/RateControllerTest.java new file mode 100644 index 0000000..cb860b4 --- /dev/null +++ b/src/test/java/com/api/UDEE/controller/RateControllerTest.java @@ -0,0 +1,64 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.AbstractController; +import com.api.UDEE.service.RateService; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import static com.api.UDEE.utils.TestUtils.aRateJSON; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest(classes = RateController.class) +public class RateControllerTest extends AbstractController{ + @MockBean + private RateService rateService; + + @Test + public void allRate() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/api/rates") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + @Test + public void getRateById() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .get("/rates/1") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + @Test + public void newRate() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .post("/api/rates") + .contentType(MediaType.APPLICATION_JSON) + .content(aRateJSON())) + .andExpect(status().isOk()); + + assertEquals(HttpStatus.OK.value(), resultActions.andReturn().getResponse().getStatus()); + } + + /* + @Test + public void addPersonBadRequest() throws Exception { + final ResultActions resultActions = givenController().perform(MockMvcRequestBuilders + .post("/api/rates") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isBadRequest()); + + assertEquals(HttpStatus.BAD_REQUEST.value(), resultActions.andReturn().getResponse().getStatus()); + }*/ + +} diff --git a/src/test/java/com/api/UDEE/controller/UsuarioControllerTest.java b/src/test/java/com/api/UDEE/controller/UsuarioControllerTest.java new file mode 100644 index 0000000..baa660d --- /dev/null +++ b/src/test/java/com/api/UDEE/controller/UsuarioControllerTest.java @@ -0,0 +1,110 @@ +package com.api.UDEE.controller; + +import com.api.UDEE.domain.Usuario; +import com.api.UDEE.dto.UserDto; +import com.api.UDEE.service.UsuarioService; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.modelmapper.ModelMapper; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.util.Collections; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class UsuarioControllerTest { + + private UsuarioService usuarioService; + private ModelMapper modelMapper; + private ObjectMapper objectMapper; + + private UsuarioController usuarioController; + + private static List EMPTY_LIST = Collections.emptyList(); + private static List USUARIO_LIST = List.of(Usuario.builder().username("nico").id(1).build(), + Usuario.builder().username("nicolas").id(2).build()); + + + @BeforeEach + public void setUp() { + usuarioService = mock(UsuarioService.class); + usuarioController = new UsuarioController(usuarioService,modelMapper,objectMapper); + } + + + // Vamos a testear que haya paises dentro de lo que se pidio + + @Test + public void testAllUsersHttpStatus200() { + + //given + Pageable pageable = PageRequest.of(1, 10); + Page mockedPage = mock(Page.class); + when(mockedPage.getTotalElements()).thenReturn(100L); + when(mockedPage.getTotalPages()).thenReturn(10); + when(mockedPage.getContent()).thenReturn(USUARIO_LIST); + when(usuarioService.allUsers(pageable)).thenReturn(mockedPage); + + //Then + ResponseEntity> response = usuarioController.allUsers(pageable); + + //Assert + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertEquals(100L, Long.parseLong(response.getHeaders().get("X-Total-Count").get(0)) ); + assertEquals(10, Integer.parseInt(response.getHeaders().get("X-Total-Pages").get(0)) ); + assertEquals(USUARIO_LIST, response.getBody()); + } + + + //* Vamos a testear que haya paises dentro de lo que se pidio + + @Test + public void testAllUsersNoContent() { + //given + Pageable pageable = PageRequest.of(50, 10); + Page mockedPage = mock(Page.class); + when(mockedPage.getContent()).thenReturn(EMPTY_LIST); + when(usuarioService.allUsers(pageable)).thenReturn(mockedPage); + + //Then + ResponseEntity> response = usuarioController.allUsers(pageable); + + //Assert + assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode()); + assertEquals(0, response.getBody().size()); + } + + @Test + public void addClient_Test200(){ + MockHttpServletRequest request = new MockHttpServletRequest(); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); + + //Date birtday = new SimpleDateFormat("yyyy-MM-dd").parse("2020-02-02"); + ServletUriComponentsBuilder location = mock(ServletUriComponentsBuilder.class); + + UserDto registerDto = UserDto.builder() + .id(1) + .username("nicolas") + .build(); + + Usuario usuario= Usuario.builder().id(1).username("nicolas").password("1234").build(); + + when(usuarioService.newUser(usuario)).thenReturn(usuario); + + ResponseEntity response = usuarioController.newClient(usuario); + + assertEquals(HttpStatus.CREATED, response.getStatusCode()); + } +} diff --git a/src/test/java/com/api/UDEE/service/UsuarioServiceTest.java b/src/test/java/com/api/UDEE/service/UsuarioServiceTest.java new file mode 100644 index 0000000..379bf40 --- /dev/null +++ b/src/test/java/com/api/UDEE/service/UsuarioServiceTest.java @@ -0,0 +1,131 @@ +package com.api.UDEE.service; + +import com.api.UDEE.domain.Usuario; +import com.api.UDEE.exceptions.AddressNotExistsException; +import com.api.UDEE.repository.UsuarioRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatchers; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static com.api.UDEE.utils.TestUtils.*; +import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.*; +@ExtendWith(MockitoExtension.class) + +class UsuarioServiceTest { + + @InjectMocks + private UsuarioService usuarioService; + + @Mock + private UsuarioRepository usuarioRepository; + + /*@Mock + private UsuarioRepository usuarioRepository; +*/ + + @Test + void getUserById() throws AddressNotExistsException { + Usuario usuario= aUsuario(); + Mockito.when(usuarioRepository.findById(usuario.getId())).thenReturn(Optional.of(usuario)); + + Usuario response = usuarioService.getUserById(1); + assertNotNull(response); + assertEquals(usuario, response); + } + + @Test + void shouldSaveUser() throws AddressNotExistsException { + + Usuario usuario= aUsuario(); + + Mockito.when(usuarioRepository.save(usuario)).thenReturn(usuario); + + assertNotNull(usuario); + + usuarioRepository.save(usuario); + + } + + @Test + void badRequestSaveUser(){ + Usuario usuario= aUsuario(); + + when(usuarioRepository.save(usuario)).thenReturn(usuario); + + //when(usuarioService.getReduceUser(user.getIdUser())).thenReturn(userReduce); + when(usuarioRepository.findById(usuario.getId())).thenReturn(null); + + //assertEquals(400, response.getStatusCodeValue()); + //assertNull(response.getBody()); + } + + @Test + void shouldLogin(){ + Usuario usuario= new Usuario();//(1,"nico","1234"); + String username="nico"; + String password="1234"; + usuario.setUsername(username); + usuario.setPassword(password); + when(usuarioRepository.findByUsernameAndPassword(username,password)).thenReturn(usuario); + Usuario response= usuarioService.login(username,password); + + assertNotNull(response); + assertEquals(usuario,response); + } + + + @Test + void badRequestLogin(){ + Usuario usuario= new Usuario(); + String username="nico"; + String password="1234"; + usuario.setUsername(username); + usuario.setPassword(password); + + Mockito.when(usuarioRepository.findByUsernameAndPassword(username, password)).thenReturn(null); + + assertThrows(RuntimeException.class, () -> { + usuarioService.login(username, password); + }); + } + + @Test + void shouldGetAll() { + /*Usuario usuario= new Usuario(1,"nicolas","roldan"); + Usuario usuario2= new Usuario(2,"rodrigo","villarroel"); + List usersList = new ArrayList<>(); + usersList.add(usuario); + usersList.add(usuario2); + Page user = new PageImpl<>(usersList); + + when(usuarioRepository.findAll()).thenReturn(user); + Page response = usuarioService.allUsers((Pageable) user); + + assertNotNull(response); + assertEquals(usersList, response); +*/ + + Pageable pageable = aPageable(); + Page page = aUsuarioPage(); + + when(usuarioRepository.findAll(pageable)).thenReturn(page); + + Page u = usuarioService.allUsers(pageable); + + //assertEquals(page.getContent().get(0).getDni(),c.getContent().get(0).getDni()); + assertEquals(page.getContent().get(0).getId(),u.getContent().get(0).getId()); + //assertEquals(pageable.getPageNumber(),u.getTotalPages()); + } +} diff --git a/src/test/java/com/api/UDEE/utils/LocalDateDeserializer.java b/src/test/java/com/api/UDEE/utils/LocalDateDeserializer.java new file mode 100644 index 0000000..6e8fc50 --- /dev/null +++ b/src/test/java/com/api/UDEE/utils/LocalDateDeserializer.java @@ -0,0 +1,18 @@ +package com.api.UDEE.utils; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; + +import java.lang.reflect.Type; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class LocalDateDeserializer implements JsonDeserializer { + + @Override + public LocalDate deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { + return LocalDate.parse(jsonElement.getAsString(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + } +} diff --git a/src/test/java/com/api/UDEE/utils/LocalDateSerializer.java b/src/test/java/com/api/UDEE/utils/LocalDateSerializer.java new file mode 100644 index 0000000..bc3f3d0 --- /dev/null +++ b/src/test/java/com/api/UDEE/utils/LocalDateSerializer.java @@ -0,0 +1,17 @@ +package com.api.UDEE.utils; + +import com.google.gson.*; + +import java.lang.reflect.Type; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class LocalDateSerializer implements JsonSerializer { + + public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + @Override + public JsonElement serialize(LocalDate localDate, Type type, JsonSerializationContext jsonSerializationContext) { + return new JsonPrimitive(formatter.format(localDate)); + } +} diff --git a/src/test/java/com/api/UDEE/utils/TestUtils.java b/src/test/java/com/api/UDEE/utils/TestUtils.java new file mode 100644 index 0000000..ee35e15 --- /dev/null +++ b/src/test/java/com/api/UDEE/utils/TestUtils.java @@ -0,0 +1,87 @@ +package com.api.UDEE.utils; + +import com.api.UDEE.domain.Client; +import com.api.UDEE.domain.Model; +import com.api.UDEE.domain.Rate; +import com.api.UDEE.domain.Usuario; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; + +import java.time.LocalDate; +import java.util.List; + +public class TestUtils { + + public static String aRateJSON() { + final Gson gson = new GsonBuilder() + .registerTypeAdapter(LocalDate.class, new LocalDateSerializer()) + .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer()) + .setPrettyPrinting().create(); + + return gson.toJson(aRate()); + } + + public static Rate aRate(){ + Rate r= new Rate(); + r.setId(1); + r.setPrice(350.5F); + return r; + } + + public static String aModelJSON() { + final Gson gson = new GsonBuilder() + .registerTypeAdapter(LocalDate.class, new LocalDateSerializer()) + .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer()) + .setPrettyPrinting().create(); + + return gson.toJson(aModel()); + } + + public static Model aModel(){ + Model m= new Model(); + m.setId(1); + m.setName("a10"); + return m; + } + + public static Pageable aPageable(){ + return PageRequest.of(0,10); + } + + public static Page aUsuarioPage(){ + return new PageImpl<>(List.of(aUsuario())); + } + //aClientPage + + public static Usuario aUsuario(){ + Usuario u = new Usuario(); + u.setId(1); + u.setUsername("nico"); + u.setPassword("1234"); + return u; + } + + public static Client aClient() { + Client c = new Client(); + c.setEmail("nicolasroldan31@gmail.com"); + c.setId(1); + c.setName("nicolas"); + c.setLast_name("roldan"); + return c; + } + /* + public static Persona aPersona() { + Persona p = new Persona(); + p.setApellido("apellido"); + p.setNombre("nombre"); + p.setDireccion("calle falsa 123"); + p.setDni("dni"); + p.setVehiculoList(new ArrayList<>()); + return p; + } + */ +}