Herik dos Santos Lorenção / 2020-Herik-SRH

Download as
Browse Code »

Commit 6c234cb64d19708c76b295479a59cf177ffdd99a

Authored by Herik dos Santos Lorenção
1 parent b5c5f9ce
Exists in master

Correções no diagrama e código

Showing 8 changed files with 10 additions and 42 deletions   Show diff stats
codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/builder/TypeItemBuilder.java
  Diff comments   View file @6c234cb
1 package edu.ifes.ci.si.les.srh.builder; 1 package edu.ifes.ci.si.les.srh.builder;
2 2
3 -import edu.ifes.ci.si.les.srh.model.Attribute;  
4 import edu.ifes.ci.si.les.srh.model.Item; 3 import edu.ifes.ci.si.les.srh.model.Item;
5 import edu.ifes.ci.si.les.srh.model.TypeItem; 4 import edu.ifes.ci.si.les.srh.model.TypeItem;
6 5
@@ -9,7 +8,7 @@ import java.util.List; @@ -9,7 +8,7 @@ import java.util.List;
9 public final class TypeItemBuilder { 8 public final class TypeItemBuilder {
10 private Integer id; 9 private Integer id;
11 private String name; 10 private String name;
12 - private List<Attribute> requiredAttributes; 11 + private String requiredAttributes;
13 private List<Item> itens; 12 private List<Item> itens;
14 13
15 private TypeItemBuilder() { 14 private TypeItemBuilder() {
@@ -29,7 +28,7 @@ public final class TypeItemBuilder { @@ -29,7 +28,7 @@ public final class TypeItemBuilder {
29 return this; 28 return this;
30 } 29 }
31 30
32 - public TypeItemBuilder withRequiredAttributes(List<Attribute> requiredAttributes) { 31 + public TypeItemBuilder withRequiredAttributes(String requiredAttributes) {
33 this.requiredAttributes = requiredAttributes; 32 this.requiredAttributes = requiredAttributes;
34 return this; 33 return this;
35 } 34 }
codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemDto.java
  Diff comments   View file @6c234cb
1 package edu.ifes.ci.si.les.srh.dto.resource; 1 package edu.ifes.ci.si.les.srh.dto.resource;
2 2
3 -import edu.ifes.ci.si.les.srh.model.Attribute;  
4 import edu.ifes.ci.si.les.srh.model.TypeItem; 3 import edu.ifes.ci.si.les.srh.model.TypeItem;
5 4
6 import java.util.ArrayList; 5 import java.util.ArrayList;
@@ -17,13 +16,7 @@ public class TypeItemDto { @@ -17,13 +16,7 @@ public class TypeItemDto {
17 this.requiredAttributes = mountRequiredAttributes(typeItem.getRequiredAttributes()); 16 this.requiredAttributes = mountRequiredAttributes(typeItem.getRequiredAttributes());
18 } 17 }
19 18
20 - private List<Integer> mountRequiredAttributes(List<Attribute> requiredAttributes) {  
21 - List<Integer> attributes = new ArrayList<>();  
22 -  
23 - for (Attribute attribute : requiredAttributes) {  
24 - attributes.add(attribute.getId());  
25 - }  
26 -  
27 - return attributes; 19 + public List<Integer> mountRequiredAttributes(String requiredAttributes) {
  20 + return null;
28 } 21 }
29 } 22 }
codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/dto/resource/TypeItemForm.java
  Diff comments   View file @6c234cb
1 package edu.ifes.ci.si.les.srh.dto.resource; 1 package edu.ifes.ci.si.les.srh.dto.resource;
2 2
3 import edu.ifes.ci.si.les.srh.builder.TypeItemBuilder; 3 import edu.ifes.ci.si.les.srh.builder.TypeItemBuilder;
4 -import edu.ifes.ci.si.les.srh.model.Attribute;  
5 import edu.ifes.ci.si.les.srh.model.TypeItem; 4 import edu.ifes.ci.si.les.srh.model.TypeItem;
6 5
7 import java.util.ArrayList; 6 import java.util.ArrayList;
@@ -13,13 +12,7 @@ public class TypeItemForm { @@ -13,13 +12,7 @@ public class TypeItemForm {
13 private List<Integer> requiredAttributes; 12 private List<Integer> requiredAttributes;
14 13
15 public TypeItem build() { 14 public TypeItem build() {
16 - List<Attribute> attributes = new ArrayList<>();  
17 -  
18 - for (Integer id : requiredAttributes) {  
19 - Attribute attribute = new Attribute();  
20 - attribute.setId(id);  
21 - attributes.add(attribute);  
22 - } 15 + String attributes = mountRequiredAttributes(requiredAttributes);
23 16
24 return TypeItemBuilder.aTypeItem() 17 return TypeItemBuilder.aTypeItem()
25 .withId(id) 18 .withId(id)
@@ -27,4 +20,8 @@ public class TypeItemForm { @@ -27,4 +20,8 @@ public class TypeItemForm {
27 .withRequiredAttributes(attributes) 20 .withRequiredAttributes(attributes)
28 .build(); 21 .build();
29 } 22 }
  23 +
  24 + private String mountRequiredAttributes(List<Integer> requiredAttributes) {
  25 + return null;
  26 + }
30 } 27 }
codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/Attribute.java
View file @b5c5f9c
@@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
1 -package edu.ifes.ci.si.les.srh.model;  
2 -  
3 -import lombok.Data;  
4 -  
5 -import javax.persistence.*;  
6 -  
7 -@Entity  
8 -@Data  
9 -public class Attribute {  
10 - @Id  
11 - @GeneratedValue(strategy = GenerationType.IDENTITY)  
12 - private Integer id;  
13 -  
14 - @ManyToOne  
15 - private TypeItem typeItem;  
16 -  
17 - private String name;  
18 - private String type;  
19 -}  
codigos/backend/src/main/java/edu/ifes/ci/si/les/srh/model/TypeItem.java
  Diff comments   View file @6c234cb
@@ -13,9 +13,7 @@ public class TypeItem { @@ -13,9 +13,7 @@ public class TypeItem {
13 private Integer id; 13 private Integer id;
14 14
15 private String name; 15 private String name;
16 -  
17 - @OneToMany(mappedBy = "typeItem")  
18 - private List<Attribute> requiredAttributes; 16 + private String requiredAttributes;
19 17
20 @OneToMany(mappedBy = "typeItem") 18 @OneToMany(mappedBy = "typeItem")
21 private List<Item> itens; 19 private List<Item> itens;
documentos/Anotações Extras/DCA.jpg
View file @6c234cb

146 KB | W: | H:

153 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
documentos/Anotações Extras/DCA.jpg.bak 0 → 100644
View file @6c234cb
No preview for this file type
documentos/SRH-UML_02_02.asta
View file @6c234cb
No preview for this file type