Skip to content

Commit fa3939c

Browse files
committed
feat: users list
1 parent 5dabf98 commit fa3939c

File tree

19 files changed

+4019
-425
lines changed

19 files changed

+4019
-425
lines changed

.docker/docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
database:
55
image: postgres:13
66
restart: unless-stopped
7-
container_name: example-api-database
7+
container_name: crud-database
88
command:
99
[
1010
"postgres",

api/src/main/java/com/github/throyer/common/springboot/domain/user/entity/User.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ public static User from(Tuple tuple) {
157157
var user = new User();
158158
user.setId(tuple.get("id", BigInteger.class));
159159
user.setName(tuple.get("name", String.class));
160+
user.setActive(tuple.get("active", Boolean.class));
160161
user.setEmail(tuple.get("email", String.class));
161162
user.setPassword(tuple.get("password", String.class));
162163
user.setRoles(ofNullable(tuple.get("roles", String.class))

api/src/main/java/com/github/throyer/common/springboot/domain/user/model/UserDetails.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.github.throyer.common.springboot.domain.user.model;
22

3+
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
34
import static java.util.Optional.ofNullable;
45

56
import java.util.ArrayList;
67
import java.util.List;
78

9+
import com.fasterxml.jackson.annotation.JsonInclude;
810
import com.github.throyer.common.springboot.domain.management.model.Entity;
911
import com.github.throyer.common.springboot.domain.role.entity.Role;
1012
import com.github.throyer.common.springboot.domain.user.entity.User;
@@ -19,11 +21,15 @@ public class UserDetails implements Entity {
1921
private final String name;
2022
private final String email;
2123

24+
@JsonInclude(NON_NULL)
25+
private Boolean active;
26+
2227
private final List<String> roles;
2328

2429
public UserDetails(User user) {
2530
this.id = user.getId();
2631
this.name = user.getName();
32+
this.active = user.isActive();
2733
this.email = user.getEmail();
2834

2935
this.roles = user.getRoles()

api/src/main/java/com/github/throyer/common/springboot/domain/user/repository/Queries.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ur.user_id, string_agg(r.initials, ',') roles
4040
u."name",
4141
u.email,
4242
u.password,
43+
u.active,
4344
urs.roles
4445
from
4546
"user" u
@@ -62,6 +63,7 @@ ur.user_id, string_agg(r.initials, ',') roles
6263
u."name",
6364
u.email,
6465
u.password,
66+
u.active,
6567
urs.roles
6668
from
6769
"user" u

0 commit comments

Comments
 (0)