diff --git a/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataComplete.java b/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataComplete.java index 78f1b6d..e0f9207 100644 --- a/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataComplete.java +++ b/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataComplete.java @@ -4,9 +4,9 @@ import com.pedro.sphynx.infrastructure.entities.Consumer; import com.pedro.sphynx.infrastructure.entities.Permission; -public record ConsumerDataComplete (Long id, String ra, String tag, PermissionDataComplete permission){ +public record ConsumerDataComplete (Long id, String name, String ra, String tag, PermissionDataComplete permission){ public ConsumerDataComplete(Consumer consumer){ - this(consumer.getId(), consumer.getRa(), consumer.getTag(), new PermissionDataComplete(consumer.getPermission())); + this(consumer.getId(), consumer.getName(), consumer.getRa(), consumer.getTag(), new PermissionDataComplete(consumer.getPermission())); } } diff --git a/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataInput.java b/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataInput.java index 2c1c8ec..75ebf61 100644 --- a/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataInput.java +++ b/src/main/java/com/pedro/sphynx/application/dtos/consumer/ConsumerDataInput.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotNull; public record ConsumerDataInput( + @NotBlank String name, @NotBlank String ra, @NotBlank String tag, @NotNull int permission){ diff --git a/src/main/java/com/pedro/sphynx/infrastructure/entities/Consumer.java b/src/main/java/com/pedro/sphynx/infrastructure/entities/Consumer.java index e7b506c..a6ce9d9 100644 --- a/src/main/java/com/pedro/sphynx/infrastructure/entities/Consumer.java +++ b/src/main/java/com/pedro/sphynx/infrastructure/entities/Consumer.java @@ -20,6 +20,7 @@ public class Consumer { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + private String name; private String ra; private String tag; @@ -32,6 +33,7 @@ public class Consumer { public Consumer(ConsumerDataInput data, Permission permission){ this.id = null; + this.name = data.name(); this.ra = data.ra(); this.tag = data.tag(); this.permission = permission; diff --git a/src/main/resources/db/migration/V2__create-table-consumers.sql b/src/main/resources/db/migration/V2__create-table-consumers.sql index 57baf98..5addd62 100644 --- a/src/main/resources/db/migration/V2__create-table-consumers.sql +++ b/src/main/resources/db/migration/V2__create-table-consumers.sql @@ -1,5 +1,6 @@ create table if not exists consumers( id bigint not null auto_increment, + name varchar(255) not null, ra varchar(255) not null, tag varchar(255) not null,