Skip to content

Commit 5e463d4

Browse files
patoupatou
authored
Version 3.0
- Les listes sont maintenant partagé avec un certains nombres de personnes - Possibilité d'avoir plusieurs listes. - Possibilités d'avoir plusieurs bénéficiaires par liste - Il est maintenant possible d'ajouter plusieurs liens - Il est aussi possible d'ajouter une photo. - Participez à un cadeau qui est déjà offert. - Ajouté des idées sur la liste d'une autre personne qu'elle ne verra pas.
2 parents 08ea16f + fafa96c commit 5e463d4

30 files changed

+1619
-405
lines changed

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/AppUserDto.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package fr.desaintsteban.liste.envies.dto;
22

3+
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4+
35
/**
4-
* Created by sfeir on 30/11/2016.
6+
*
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public class AppUserDto {
710
private String email;
811

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/EnvieDto.java‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/EnvyDto.java‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
package fr.desaintsteban.liste.envies.dto;
2+
3+
import fr.desaintsteban.liste.envies.model.Link;
4+
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
5+
6+
import java.util.List;
7+
8+
/**
9+
* 01/10/2014.
10+
*/
11+
@JsonIgnoreProperties(ignoreUnknown = true)
12+
public class EnvyDto {
13+
private Long id;
14+
15+
private String owner;
16+
private Boolean suggest = false;
17+
private String label;
18+
19+
private String description;
20+
21+
private String price;
22+
private String picture;
23+
private List<Link> urls;
24+
private List<String> userTake;
25+
26+
private List<NoteDto> notes;
27+
28+
public EnvyDto() {
29+
}
30+
31+
public Long getId() {
32+
return id;
33+
}
34+
35+
public void setId(Long id) {
36+
this.id = id;
37+
}
38+
39+
public String getOwner() {
40+
return owner;
41+
}
42+
43+
public void setOwner(String owner) {
44+
this.owner = owner;
45+
}
46+
47+
public Boolean getSuggest() {
48+
return suggest;
49+
}
50+
51+
public void setSuggest(Boolean suggest) {
52+
this.suggest = suggest;
53+
}
54+
55+
public String getLabel() {
56+
return label;
57+
}
58+
59+
public void setLabel(String label) {
60+
this.label = label;
61+
}
62+
63+
public String getDescription() {
64+
return description;
65+
}
66+
67+
public void setDescription(String description) {
68+
this.description = description;
69+
}
70+
71+
public String getPicture() {
72+
return picture;
73+
}
74+
75+
public void setPicture(String picture) {
76+
this.picture = picture;
77+
}
78+
79+
public List<Link> getUrls() {
80+
return urls;
81+
}
82+
83+
public void setUrls(List<Link> urls) {
84+
this.urls = urls;
85+
}
86+
87+
public List<String> getUserTake() {
88+
return userTake;
89+
}
90+
91+
public void setUserTake(List<String> userTake) {
92+
this.userTake = userTake;
93+
}
94+
95+
public String getPrice() {
96+
return price;
97+
}
98+
99+
public void setPrice(String price) {
100+
this.price = price;
101+
}
102+
103+
public List<NoteDto> getNotes() {
104+
return notes;
105+
}
106+
107+
public void setNotes(List<NoteDto> notes) {
108+
this.notes = notes;
109+
}
110+
}

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/ListEnviesDto.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package fr.desaintsteban.liste.envies.dto;
2+
3+
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4+
5+
import java.util.List;
6+
7+
/**
8+
*
9+
*/
10+
@JsonIgnoreProperties(ignoreUnknown = true)
11+
public class ListEnviesDto {
12+
private String name;
13+
14+
private String title;
15+
private String description;
16+
private Boolean isOwner;
17+
private List<UserShareDto> users;
18+
19+
private List<UserShareDto> owners;
20+
21+
public List<UserShareDto> getOwners() {
22+
return owners;
23+
}
24+
25+
public void setOwners(List<UserShareDto> owners) {
26+
this.owners = owners;
27+
}
28+
29+
public String getName() {
30+
return name;
31+
}
32+
33+
public void setName(String name) {
34+
this.name = name;
35+
}
36+
37+
public String getTitle() {
38+
return title;
39+
}
40+
41+
public void setTitle(String title) {
42+
this.title = title;
43+
}
44+
45+
public String getDescription() {
46+
return description;
47+
}
48+
49+
public void setDescription(String description) {
50+
this.description = description;
51+
}
52+
53+
public List<UserShareDto> getUsers() {
54+
return users;
55+
}
56+
57+
public void setUsers(List<UserShareDto> users) {
58+
this.users = users;
59+
}
60+
61+
public Boolean getOwner() {
62+
return isOwner;
63+
}
64+
65+
public void setOwner(Boolean owner) {
66+
isOwner = owner;
67+
}
68+
}

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/UserShareDto.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package fr.desaintsteban.liste.envies.dto;
2+
3+
import fr.desaintsteban.liste.envies.model.AppUser;
4+
import fr.desaintsteban.liste.envies.model.UserShareType;
5+
6+
import java.util.Map;
7+
8+
/**
9+
*
10+
*/
11+
public class UserShareDto {
12+
private String email;
13+
private String name;
14+
private UserShareType type;
15+
16+
public UserShareDto() {
17+
}
18+
19+
public UserShareDto(String email, String name, UserShareType type) {
20+
this.email = email;
21+
this.name = name;
22+
this.type = type;
23+
}
24+
25+
public UserShareDto(String email, UserShareType type, Map<String, AppUser> userName) {
26+
this.email = email;
27+
this.type = type;
28+
if (userName != null && userName.containsKey(email)) {
29+
this.name = userName.get(email).getName();
30+
}
31+
}
32+
33+
public String getEmail() {
34+
return email;
35+
}
36+
37+
public void setEmail(String email) {
38+
this.email = email;
39+
}
40+
41+
public UserShareType getType() {
42+
return type;
43+
}
44+
45+
public void setType(UserShareType type) {
46+
this.type = type;
47+
}
48+
49+
public String getName() {
50+
return name;
51+
}
52+
53+
public void setName(String name) {
54+
this.name = name;
55+
}
56+
}

‎liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/Envie.java‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.googlecode.objectify.annotation.Entity;
66
import com.googlecode.objectify.annotation.Id;
77
import com.googlecode.objectify.annotation.Parent;
8-
import fr.desaintsteban.liste.envies.dto.EnvieDto;
8+
import fr.desaintsteban.liste.envies.dto.EnvyDto;
99
import fr.desaintsteban.liste.envies.dto.NoteDto;
1010
import fr.desaintsteban.liste.envies.util.EncodeUtils;
1111
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -19,6 +19,7 @@
1919
*/
2020
@Cache
2121
@Entity
22+
@Deprecated
2223
public class Envie {
2324

2425
@Parent
@@ -49,38 +50,6 @@ public Envie(AppUser owner, String label) {
4950
this.notes = new ArrayList<>();
5051
}
5152

52-
53-
public Envie(EnvieDto envie) {
54-
setId(envie.getId());
55-
setLabel(envie.getLabel());
56-
setComment(envie.getComment());
57-
setPrice(envie.getPrice());
58-
setUrl(envie.getUrl());
59-
setUserTake(EncodeUtils.encode(envie.getUserTake()));
60-
61-
this.notes = new ArrayList<>();
62-
63-
}
64-
65-
public EnvieDto toDto() {
66-
EnvieDto envie = new EnvieDto();
67-
envie.setId(getId());
68-
envie.setLabel(getLabel());
69-
envie.setComment(getComment());
70-
envie.setPrice(getPrice());
71-
envie.setUrl(getUrl());
72-
envie.setUserTake(EncodeUtils.decode(getUserTake()));
73-
74-
if (this.notes != null && !this.notes.isEmpty()) {
75-
List<NoteDto> listNoteDto = new ArrayList<>();
76-
for (Note note : this.notes) {
77-
listNoteDto.add(note.toDto());
78-
}
79-
envie.setNotes(listNoteDto);
80-
}
81-
return envie;
82-
}
83-
8453
public Key<AppUser> getOwner() {
8554
return owner;
8655
}

0 commit comments

Comments
 (0)