From 6c234cb64d19708c76b295479a59cf177ffdd99a Mon Sep 17 00:00:00 2001 From: Herik dos Santos Lorenção Date: Tue, 16 Jun 2020 00:23:05 -0300 Subject: [PATCH] Correções no diagrama e código --- codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java | 5 ++--- codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java | 11 ++--------- codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java | 13 +++++-------- codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java | 19 ------------------- codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java | 4 +--- documentos/Anotações Extras/DCA.jpg | Bin 149803 -> 0 bytes documentos/Anotações Extras/DCA.jpg.bak | Bin 0 -> 149803 bytes documentos/SRH-UML_02_02.asta | Bin 33285 -> 0 bytes 8 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java create mode 100644 documentos/Anotações Extras/DCA.jpg.bak diff --git a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java index 0719ac3..34d40fa 100644 --- a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java +++ b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java @@ -1,6 +1,5 @@ package edu.ifes.ci.si.les.srh.builder; -import edu.ifes.ci.si.les.srh.model.Attribute; import edu.ifes.ci.si.les.srh.model.Item; import edu.ifes.ci.si.les.srh.model.TypeItem; @@ -9,7 +8,7 @@ import java.util.List; public final class TypeItemBuilder { private Integer id; private String name; - private List requiredAttributes; + private String requiredAttributes; private List itens; private TypeItemBuilder() { @@ -29,7 +28,7 @@ public final class TypeItemBuilder { return this; } - public TypeItemBuilder withRequiredAttributes(List requiredAttributes) { + public TypeItemBuilder withRequiredAttributes(String requiredAttributes) { this.requiredAttributes = requiredAttributes; return this; } diff --git a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java index bf6b516..74890a0 100644 --- a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java +++ b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java @@ -1,6 +1,5 @@ package edu.ifes.ci.si.les.srh.dto.resource; -import edu.ifes.ci.si.les.srh.model.Attribute; import edu.ifes.ci.si.les.srh.model.TypeItem; import java.util.ArrayList; @@ -17,13 +16,7 @@ public class TypeItemDto { this.requiredAttributes = mountRequiredAttributes(typeItem.getRequiredAttributes()); } - private List mountRequiredAttributes(List requiredAttributes) { - List attributes = new ArrayList<>(); - - for (Attribute attribute : requiredAttributes) { - attributes.add(attribute.getId()); - } - - return attributes; + public List mountRequiredAttributes(String requiredAttributes) { + return null; } } diff --git a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java index 6c8c4d1..4ee2682 100644 --- a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java +++ b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java @@ -1,7 +1,6 @@ package edu.ifes.ci.si.les.srh.dto.resource; import edu.ifes.ci.si.les.srh.builder.TypeItemBuilder; -import edu.ifes.ci.si.les.srh.model.Attribute; import edu.ifes.ci.si.les.srh.model.TypeItem; import java.util.ArrayList; @@ -13,13 +12,7 @@ public class TypeItemForm { private List requiredAttributes; public TypeItem build() { - List attributes = new ArrayList<>(); - - for (Integer id : requiredAttributes) { - Attribute attribute = new Attribute(); - attribute.setId(id); - attributes.add(attribute); - } + String attributes = mountRequiredAttributes(requiredAttributes); return TypeItemBuilder.aTypeItem() .withId(id) @@ -27,4 +20,8 @@ public class TypeItemForm { .withRequiredAttributes(attributes) .build(); } + + private String mountRequiredAttributes(List requiredAttributes) { + return null; + } } diff --git a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java deleted file mode 100644 index db88ffd..0000000 --- a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java +++ /dev/null @@ -1,19 +0,0 @@ -package edu.ifes.ci.si.les.srh.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Data -public class Attribute { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - - @ManyToOne - private TypeItem typeItem; - - private String name; - private String type; -} diff --git a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java index 6d7ac75..539ff65 100644 --- a/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java +++ b/codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java @@ -13,9 +13,7 @@ public class TypeItem { private Integer id; private String name; - - @OneToMany(mappedBy = "typeItem") - private List requiredAttributes; + private String requiredAttributes; @OneToMany(mappedBy = "typeItem") private List itens; diff --git a/documentos/Anotações Extras/DCA.jpg b/documentos/Anotações Extras/DCA.jpg index 0fabf58..a12c51f 100644 Binary files a/documentos/Anotações Extras/DCA.jpg and b/documentos/Anotações Extras/DCA.jpg differ diff --git a/documentos/Anotações Extras/DCA.jpg.bak b/documentos/Anotações Extras/DCA.jpg.bak new file mode 100644 index 0000000..0fabf58 Binary files /dev/null and b/documentos/Anotações Extras/DCA.jpg.bak differ diff --git a/documentos/SRH-UML_02_02.asta b/documentos/SRH-UML_02_02.asta index 29c5580..5551af1 100644 Binary files a/documentos/SRH-UML_02_02.asta and b/documentos/SRH-UML_02_02.asta differ -- libgit2 0.21.2