develop

.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/

.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();
+    }
+
+}

.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

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 */
+