From 5df6894c1006341d6371bc5cf6bf21626ac5b179 Mon Sep 17 00:00:00 2001
From: jon ander <jonander2233@gmail.com>
Date: Thu, 10 Apr 2025 19:26:37 +0200
Subject: [PATCH] Refactor entity classes to change ID type from Long to
 Integer; update User registration method to accept Departamento object

---
 .../com/ieslamar/GestionInventario/entities/Categoria.java   | 2 +-
 .../ieslamar/GestionInventario/entities/Departamento.java    | 2 +-
 .../java/com/ieslamar/GestionInventario/entities/Item.java   | 5 +++--
 .../com/ieslamar/GestionInventario/entities/Propiedad.java   | 4 ++--
 .../com/ieslamar/GestionInventario/entities/TipoDato.java    | 2 +-
 .../com/ieslamar/GestionInventario/entities/Ubicacion.java   | 2 +-
 .../java/com/ieslamar/GestionInventario/entities/User.java   | 4 ++++
 .../com/ieslamar/GestionInventario/services/UserService.java | 5 +++--
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/Categoria.java b/src/main/java/com/ieslamar/GestionInventario/entities/Categoria.java
index 8032bbf..846ec57 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/Categoria.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/Categoria.java
@@ -18,7 +18,7 @@ public class Categoria {
     @Id
     @Column(name = "idcategoria")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @Column(nullable = false)
     private String nombre;
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/Departamento.java b/src/main/java/com/ieslamar/GestionInventario/entities/Departamento.java
index 2d2990c..aa9a2f9 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/Departamento.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/Departamento.java
@@ -18,7 +18,7 @@ public class Departamento {
     @Id
     @Column(name = "iddepartamentos")
     @GeneratedValue(strategy = GenerationType.IDENTITY)  // ID autoincremental
-    private int id;
+    private Integer id;
 
     @Column(nullable = false, unique = true)  // No se permite usuarios duplicados
     private String nombre;
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/Item.java b/src/main/java/com/ieslamar/GestionInventario/entities/Item.java
index f8029ee..4d4548f 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/Item.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/Item.java
@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -22,10 +23,10 @@ public class Item {
     private Integer id;
 
     @Column(name = "fecha_alta",nullable = false)
-    private Date fechaAlta;
+    private LocalDate fechaAlta;
 
     @Column(name = "fecha_modificacion")
-    private Date fechaModificacion;
+    private LocalDate fechaModificacion;
 
     @ManyToOne
     @JoinColumn(name = "users_id", nullable = false)
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/Propiedad.java b/src/main/java/com/ieslamar/GestionInventario/entities/Propiedad.java
index 9f90dd0..ecb33c2 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/Propiedad.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/Propiedad.java
@@ -17,7 +17,7 @@ public class Propiedad {
     @Id
     @Column(name = "idpropiedad")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @Column
     private String nombre;
@@ -26,6 +26,6 @@ public class Propiedad {
     @JoinColumn(name = "tipodato_idtipodato")
     private TipoDato tipoDato;
 
-    @OneToMany(mappedBy = "priopiedad")
+    @OneToMany(mappedBy = "propiedad")
     private List<Valor> valores;
 }
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/TipoDato.java b/src/main/java/com/ieslamar/GestionInventario/entities/TipoDato.java
index 4f362bd..ed20df8 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/TipoDato.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/TipoDato.java
@@ -18,7 +18,7 @@ public class TipoDato {
     @Id
     @Column(name = "idtipodato")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @Column(name = "tipo_dato")
     private String tipoDato;
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/Ubicacion.java b/src/main/java/com/ieslamar/GestionInventario/entities/Ubicacion.java
index e77317c..841c234 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/Ubicacion.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/Ubicacion.java
@@ -19,7 +19,7 @@ public class Ubicacion {
     @Id
     @Column(name = "idubicacion")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @Column(nullable = false)
     private String nombre;
diff --git a/src/main/java/com/ieslamar/GestionInventario/entities/User.java b/src/main/java/com/ieslamar/GestionInventario/entities/User.java
index fad806d..8af6a81 100644
--- a/src/main/java/com/ieslamar/GestionInventario/entities/User.java
+++ b/src/main/java/com/ieslamar/GestionInventario/entities/User.java
@@ -31,6 +31,10 @@ public class User {
 
     @OneToMany(mappedBy = "user")
     private List<Item> items;
+
+    @ManyToOne
+    @JoinColumn(name = "departamentos_iddepartamentos", nullable = true)
+    private Departamento departamento;
 }
 
 
diff --git a/src/main/java/com/ieslamar/GestionInventario/services/UserService.java b/src/main/java/com/ieslamar/GestionInventario/services/UserService.java
index a35e77c..13131d6 100644
--- a/src/main/java/com/ieslamar/GestionInventario/services/UserService.java
+++ b/src/main/java/com/ieslamar/GestionInventario/services/UserService.java
@@ -1,5 +1,6 @@
 package com.ieslamar.GestionInventario.services;
 
+import com.ieslamar.GestionInventario.entities.Departamento;
 import com.ieslamar.GestionInventario.entities.Role;
 import com.ieslamar.GestionInventario.entities.User;
 import com.ieslamar.GestionInventario.repos.UserRepository;
@@ -18,13 +19,13 @@ public class UserService {
         this.passwordEncoder = passwordEncoder;
     }
 
-    public void registerUser(String username, String password, String role, String mail, Integer departamentos_iddepartamentos) {
+    public void registerUser(String username, String password, String role, String mail, Departamento departamento) {
         User user = new User();
         user.setNombre(username);
         user.setPassword(passwordEncoder.encode(password));
         user.setRole(Role.valueOf(role));
         user.setMail(mail);
-        user.setDepartamentos_iddepartamentos(departamentos_iddepartamentos);
+        user.setDepartamento(departamento);
         userRepository.save(user);
     }
     public List<User> getAllUsers() {