Gallardo7761/miarma-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

los muertos de la luz

Browse Source
This commit is contained in:
Jose
2026-01-30 09:27:38 +01:00
parent b23afa7b41
commit 82f41c9219
6 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -1,10 +1,10 @@
POR HACER --------------------------------
- añadir colaborador desde perfil
- apuntarse lista espera
- aceptar solicitudes LE/Colab (sobre todo por crear preusers)
- mail wrapper
- documentación
- cambiar contraseña (?)
- aceptar solicitudes LE/Colab (sobre todo por crear preusers)
- implementar urlParams para filtros
- sistema comun de errores en back & front

4
huertos/src/main/java/net/miarma/backend/huertos/client/HuertosWebClient.java
View File

@@ -48,7 +48,7 @@ public class HuertosWebClient {
RequestMetadataDto metadataDto
) {
CreateUserDto userDto = new CreateUserDto(metadataDto.name(), null);
CreateUserDto userDto = new CreateUserDto(metadataDto.displayName(), null);
UserDto createdUser = restTemplate.postForObject(
coreUrl + "/users",
userDto,
@@ -61,7 +61,7 @@ public class HuertosWebClient {
CreateCredentialDto credDto = new CreateCredentialDto(
createdUser.getUserId(),
(byte)1,
UsernameGenerator.generate(metadataDto.name(), metadataDto.memberNumber()),
UsernameGenerator.generate(metadataDto.displayName(), metadataDto.memberNumber()),
metadataDto.email(),
PasswordGenerator.generate(8),
(byte)1

7
huertos/src/main/java/net/miarma/backend/huertos/dto/RequestMetadataDto.java
View File

@@ -4,12 +4,17 @@ import java.time.Instant;
public record RequestMetadataDto(
Long id,
String name,
String displayName,
String dni,
String phone,
String email,
String username,
String address,
String zipCode,
String city,
Integer memberNumber,
Integer plotNumber,
Byte type,
Instant createdAt
) {}

20
huertos/src/main/java/net/miarma/backend/huertos/mapper/RequestMetadataMapper.java
View File

@@ -4,16 +4,27 @@ import net.miarma.backend.huertos.dto.RequestMetadataDto;
import net.miarma.backend.huertos.model.RequestMetadata;
public class RequestMetadataMapper {
public static RequestMetadata fromDto(RequestMetadataDto dto) {
if (dto == null) return null;
RequestMetadata metadata = new RequestMetadata();
metadata.setName(dto.name());
metadata.setDisplayName(dto.displayName());
metadata.setDni(dto.dni());
metadata.setPhone(dto.phone());
metadata.setEmail(dto.email());
metadata.setUsername(dto.username());
metadata.setAddress(dto.address());
metadata.setZipCode(dto.zipCode());
metadata.setCity(dto.city());
metadata.setMemberNumber(dto.memberNumber());
metadata.setPlotNumber(dto.plotNumber());
metadata.setType(dto.type());
return metadata;
}
@@ -22,12 +33,17 @@ public class RequestMetadataMapper {
return new RequestMetadataDto(
entity.getId(),
entity.getName(),
entity.getDisplayName(),
entity.getDni(),
entity.getPhone(),
entity.getEmail(),
entity.getUsername(),
entity.getAddress(),
entity.getZipCode(),
entity.getCity(),
entity.getMemberNumber(),
entity.getPlotNumber(),
entity.getType(),
entity.getCreatedAt()
);
}

76
huertos/src/main/java/net/miarma/backend/huertos/model/RequestMetadata.java
View File

@@ -12,13 +12,39 @@ public class RequestMetadata {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
@Column(name = "display_name", nullable = false, length = 150)
private String displayName;
@Column(nullable = false, length = 20)
private String dni;
@Column(length = 30)
private String phone;
@Column(nullable = false, length = 150)
private String email;
@Column(length = 255)
private String address;
@Column(name = "zip_code", length = 10)
private String zipCode;
@Column(length = 100)
private String city;
@Column(name = "member_number")
private Integer memberNumber;
@Column(name = "plot_number")
private Integer plotNumber;
private Byte type;
@Column(nullable = false, length = 100)
private String username;
@Column(name = "created_at", nullable = false, updatable = false)
private Instant createdAt;
@PrePersist
@@ -34,12 +60,12 @@ public class RequestMetadata {
this.id = id;
}
public String getName() {
return name;
public String getDisplayName() {
return displayName;
}
public void setName(String name) {
this.name = name;
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
public String getDni() {
@@ -66,6 +92,30 @@ public class RequestMetadata {
this.email = email;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getZipCode() {
return zipCode;
}
public void setZipCode(String zipCode) {
this.zipCode = zipCode;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public Integer getMemberNumber() {
return memberNumber;
}
@@ -82,6 +132,22 @@ public class RequestMetadata {
this.plotNumber = plotNumber;
}
public Byte getType() {
return type;
}
public void setType(Byte type) {
this.type = type;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public Instant getCreatedAt() {
return createdAt;
}

2
huertos/src/main/java/net/miarma/backend/huertos/service/RequestAcceptanceService.java
View File

@@ -53,7 +53,7 @@ public class RequestAcceptanceService {
case 1: // UNREGISTER
UserMetadata toRemove = metadataService.getByMemberNumber(metadata.getMemberNumber());
huertosWebClient.deleteUser(toRemove.getUserId()); // borramos User + Credential
huertosWebClient.deleteUser(toRemove.getUserId()); // borramos User + Credential + Metadata
break;
case 2: // ADD_COLLABORATOR