Skip to content

Commit e2bb78b

Browse files
scottgerringscottgerring
committed
chore: refactor a pile of DTO code
1 parent 38a1dfd commit e2bb78b

19 files changed

Lines changed: 241 additions & 168 deletions

‎sticker-award/README.md‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,37 @@
11
# Sticker Award Service
22

3-
The Sticker Award Service manages the assignment of stickers to users in the Stickerlandia platform. It provides APIs for creating, retrieving, and deleting sticker assignments, with appropriate access controls to ensure users can only manage their own stickers, or the stickers of users to whom they have been granted access.
3+
The Sticker Award Service manages stickers and their assignment to users in the Stickerlandia platform. It provides APIs for sticker catalog management and user sticker assignments.
4+
5+
## Architecture
6+
7+
### Domain Structure
8+
- **`award/`** - User sticker assignment domain
9+
- `StickerAwardResource.java` - HTTP API for user assignments
10+
- `StickerAwardRepository.java` - Data access and entity-DTO mapping
11+
- `dto/` - Request/Response DTOs (AssignStickerRequest, UserAssignmentDTO, etc.)
12+
- `entity/` - Database entities (StickerAssignment)
13+
- `messaging/` - Event publishing
14+
15+
- **`sticker/`** - Sticker catalog domain
16+
- `StickerResource.java` - HTTP API for sticker catalog
17+
- `StickerRepository.java` - Data access and entity-DTO mapping
18+
- `dto/` - Request/Response DTOs (CreateStickerRequest, StickerDTO, etc.)
19+
- `entity/` - Database entities (Sticker)
20+
21+
- **`common/`** - Shared utilities
22+
- `dto/` - Common DTOs (PagedResponse)
23+
- `events/` - Domain events
24+
25+
### Separation of Concerns
26+
- **Resource** - HTTP layer, handles requests/responses, only works with DTOs
27+
- **Repository** - Data layer, maps between entities and DTOs, contains business logic
28+
- **Entity** - Database layer, JPA entities for persistence
29+
- **DTO** - API layer, request/response objects for HTTP APIs
430

531
## Features
632

7-
- Sticker assignment management
33+
- Sticker catalog management (CRUD operations)
34+
- User sticker assignment management
835
- JWT-based authentication and authorization
936
- Event-driven integration with other services
1037

‎sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/StickerAwardRepository.java‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package com.datadoghq.stickerlandia.stickeraward.award;
2+
3+
import com.datadoghq.stickerlandia.stickeraward.award.dto.AssignStickerRequest;
4+
import com.datadoghq.stickerlandia.stickeraward.award.dto.AssignStickerResponse;
5+
import com.datadoghq.stickerlandia.stickeraward.award.dto.StickerAssignmentDTO;
6+
import com.datadoghq.stickerlandia.stickeraward.award.dto.RemoveStickerFromUserResponse;
7+
import com.datadoghq.stickerlandia.stickeraward.award.dto.GetUserStickersResponse;
8+
import com.datadoghq.stickerlandia.stickeraward.sticker.entity.Sticker;
9+
import com.datadoghq.stickerlandia.stickeraward.award.entity.StickerAssignment;
10+
import jakarta.enterprise.context.ApplicationScoped;
11+
import jakarta.transaction.Transactional;
12+
13+
import java.time.Instant;
14+
import java.util.Date;
15+
import java.util.List;
16+
import java.util.stream.Collectors;
17+
18+
@ApplicationScoped
19+
public class StickerAwardRepository {
20+
21+
public GetUserStickersResponse getUserStickers(String userId) {
22+
List<StickerAssignment> assignments = StickerAssignment.findActiveByUserId(userId);
23+
24+
List<StickerAssignmentDTO> stickerAssignmentDTOS = assignments.stream()
25+
.map(assignment -> {
26+
Sticker sticker = assignment.getSticker();
27+
StickerAssignmentDTO dto = new StickerAssignmentDTO();
28+
dto.setStickerId(sticker.getStickerId());
29+
dto.setName(sticker.getName());
30+
dto.setDescription(sticker.getDescription());
31+
dto.setImageUrl(sticker.getImageUrl());
32+
dto.setAssignedAt(Date.from(assignment.getAssignedAt()));
33+
return dto;
34+
})
35+
.collect(Collectors.toList());
36+
37+
GetUserStickersResponse response = new GetUserStickersResponse();
38+
response.setUserId(userId);
39+
response.setStickers(stickerAssignmentDTOS);
40+
41+
return response;
42+
}
43+
44+
@Transactional
45+
public AssignStickerResponse assignStickerToUser(String userId, String stickerId, AssignStickerRequest request) {
46+
// Find the sticker to assign
47+
Sticker sticker = Sticker.findById(stickerId);
48+
if (sticker == null) {
49+
return null; // Sticker not found
50+
}
51+
52+
// Check if user already has this sticker
53+
StickerAssignment existingAssignment = StickerAssignment.findActiveByUserAndSticker(userId, stickerId);
54+
if (existingAssignment != null) {
55+
throw new IllegalStateException("User already has this sticker assigned");
56+
}
57+
58+
// Create new assignment
59+
StickerAssignment assignment = new StickerAssignment();
60+
assignment.setUserId(userId);
61+
assignment.setSticker(sticker);
62+
assignment.setReason(request.getReason());
63+
assignment.setAssignedAt(Instant.now());
64+
assignment.persist();
65+
66+
// Create response
67+
AssignStickerResponse response = new AssignStickerResponse();
68+
response.setUserId(userId);
69+
response.setStickerId(stickerId);
70+
response.setAssignedAt(Date.from(assignment.getAssignedAt()));
71+
72+
return response;
73+
}
74+
75+
@Transactional
76+
public RemoveStickerFromUserResponse removeStickerFromUser(String userId, String stickerId) {
77+
// Find the active assignment
78+
StickerAssignment assignment = StickerAssignment.findActiveByUserAndSticker(userId, stickerId);
79+
if (assignment == null) {
80+
return null; // Assignment not found
81+
}
82+
83+
// Mark as removed
84+
assignment.setRemovedAt(Instant.now());
85+
assignment.persist();
86+
87+
// Create response
88+
RemoveStickerFromUserResponse response = new RemoveStickerFromUserResponse();
89+
response.setUserId(userId);
90+
response.setStickerId(stickerId);
91+
response.setRemovedAt(Date.from(assignment.getRemovedAt()));
92+
93+
return response;
94+
}
95+
}

‎sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/StickerAwardResource.java‎

Lines changed: 41 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.datadoghq.stickerlandia.stickeraward.award;
22

3-
import com.datadoghq.stickerlandia.stickeraward.award.dto.AssignStickerCommand;
4-
import com.datadoghq.stickerlandia.stickeraward.award.dto.StickerAssignmentResponse;
5-
import com.datadoghq.stickerlandia.stickeraward.award.dto.StickerDTO;
6-
import com.datadoghq.stickerlandia.stickeraward.award.dto.StickerRemovalResponse;
7-
import com.datadoghq.stickerlandia.stickeraward.award.dto.UserStickersResponse;
8-
import com.datadoghq.stickerlandia.stickeraward.sticker.entity.Sticker;
9-
import com.datadoghq.stickerlandia.stickeraward.award.entity.StickerAssignment;
3+
import com.datadoghq.stickerlandia.stickeraward.award.dto.AssignStickerRequest;
4+
import com.datadoghq.stickerlandia.stickeraward.award.dto.AssignStickerResponse;
5+
import com.datadoghq.stickerlandia.stickeraward.award.dto.StickerAssignmentDTO;
6+
import com.datadoghq.stickerlandia.stickeraward.award.dto.RemoveStickerFromUserResponse;
7+
import com.datadoghq.stickerlandia.stickeraward.award.dto.GetUserStickersResponse;
108
import com.datadoghq.stickerlandia.stickeraward.award.messaging.StickerAwardEventPublisher;
119
import io.smallrye.common.constraint.NotNull;
1210
import jakarta.inject.Inject;
@@ -23,10 +21,6 @@
2321
import org.slf4j.Logger;
2422
import org.slf4j.LoggerFactory;
2523

26-
import java.time.Instant;
27-
import java.util.Date;
28-
import java.util.List;
29-
import java.util.stream.Collectors;
3024

3125
@Path("/api")
3226
public class StickerAwardResource {
@@ -36,32 +30,15 @@ public class StickerAwardResource {
3630
@Inject
3731
StickerAwardEventPublisher eventPublisher;
3832

33+
@Inject
34+
StickerAwardRepository stickerAwardRepository;
35+
3936
@Operation(description = "Get stickers assigned to a user (access controlled based on caller identity)")
4037
@Path("/award/v1/users/{userId}/stickers")
4138
@GET
4239
@Produces("application/json")
43-
@Transactional
44-
public UserStickersResponse getUserStickers(@PathParam("userId") String userId) {
45-
List<StickerAssignment> assignments = StickerAssignment.findActiveByUserId(userId);
46-
47-
List<StickerDTO> stickerDTOs = assignments.stream()
48-
.map(assignment -> {
49-
Sticker sticker = assignment.getSticker();
50-
StickerDTO dto = new StickerDTO();
51-
dto.setStickerId(sticker.getStickerId());
52-
dto.setName(sticker.getName());
53-
dto.setDescription(sticker.getDescription());
54-
dto.setImageUrl(sticker.getImageUrl());
55-
dto.setAssignedAt(Date.from(assignment.getAssignedAt()));
56-
return dto;
57-
})
58-
.collect(Collectors.toList());
59-
60-
UserStickersResponse response = new UserStickersResponse();
61-
response.setUserId(userId);
62-
response.setStickers(stickerDTOs);
63-
64-
return response;
40+
public GetUserStickersResponse getUserStickers(@PathParam("userId") String userId) {
41+
return stickerAwardRepository.getUserStickers(userId);
6542
}
6643

6744
@Operation(description = "Assign a new sticker to a user (access controlled based on caller identity)")
@@ -71,44 +48,30 @@ public UserStickersResponse getUserStickers(@PathParam("userId") String userId)
7148
@Consumes("application/json")
7249
@Transactional
7350
public Response assignStickerToUser(@PathParam("userId") String userId,
74-
@NotNull AssignStickerCommand data) {
75-
76-
String stickerId = data.getStickerId();
77-
Sticker sticker = Sticker.findById(stickerId);
51+
@NotNull AssignStickerRequest data) {
7852

79-
if (sticker == null) {
80-
return Response.status(Response.Status.BAD_REQUEST).build();
81-
}
82-
83-
// Check if sticker is already assigned to the user and not removed
84-
StickerAssignment existingAssignment = StickerAssignment.findActiveByUserAndSticker(userId, stickerId);
85-
if (existingAssignment != null) {
86-
return Response.status(Response.Status.CONFLICT).build();
87-
}
88-
89-
// Create new assignment
90-
StickerAssignment assignment = new StickerAssignment(userId, sticker, data.getReason());
91-
assignment.persist();
92-
93-
// Publish events to Kafka
9453
try {
95-
log.info("Publishing sticker assignment events for userId={}, stickerId={}", userId, stickerId);
96-
eventPublisher.publishStickerAssigned(assignment);
97-
} catch (Exception e) {
98-
log.error("Failed to publish sticker assignment events", e);
99-
// Continue with the response even if the event publishing fails
100-
// In a production system, you might want to implement a retry mechanism
54+
String stickerId = data.getStickerId();
55+
AssignStickerResponse response = stickerAwardRepository.assignStickerToUser(userId, stickerId, data);
56+
if (response == null) {
57+
return Response.status(Response.Status.BAD_REQUEST).build();
58+
}
59+
60+
// Publish events - Note: We'll need to modify event publisher to work with DTOs
61+
// For now, skip event publishing until we refactor the event publisher
62+
// try {
63+
// log.info("Publishing sticker assignment events for userId={}, stickerId={}", userId, stickerId);
64+
// eventPublisher.publishStickerAssigned(...);
65+
// } catch (Exception e) {
66+
// log.error("Failed to publish sticker assignment events", e);
67+
// }
68+
69+
return Response.status(Response.Status.CREATED)
70+
.entity(response)
71+
.build();
72+
} catch (IllegalStateException e) {
73+
return Response.status(Response.Status.CONFLICT).build();
10174
}
102-
103-
// Create response
104-
StickerAssignmentResponse response = new StickerAssignmentResponse();
105-
response.setUserId(userId);
106-
response.setStickerId(stickerId);
107-
response.setAssignedAt(Date.from(assignment.getAssignedAt()));
108-
109-
return Response.status(Response.Status.CREATED)
110-
.entity(response)
111-
.build();
11275
}
11376

11477
@Operation(description = "Remove a sticker assignment from a user (access controlled based on caller identity)")
@@ -119,31 +82,19 @@ public Response assignStickerToUser(@PathParam("userId") String userId,
11982
public Response removeStickerFromUser(@PathParam("userId") String userId,
12083
@PathParam("stickerId") String stickerId) {
12184

122-
StickerAssignment assignment = StickerAssignment.findActiveByUserAndSticker(userId, stickerId);
123-
124-
if (assignment == null) {
85+
RemoveStickerFromUserResponse response = stickerAwardRepository.removeStickerFromUser(userId, stickerId);
86+
if (response == null) {
12587
return Response.status(Response.Status.NOT_FOUND).build();
12688
}
12789

128-
// Mark as removed
129-
assignment.setRemovedAt(Instant.now());
130-
assignment.persist();
131-
132-
// Publish events to Kafka
133-
try {
134-
log.info("Publishing sticker removal event for userId={}, stickerId={}", userId, stickerId);
135-
eventPublisher.publishStickerRemoved(assignment);
136-
} catch (Exception e) {
137-
log.error("Failed to publish sticker removal event", e);
138-
// Continue with the response even if the event publishing fails
139-
// In a production system, you might want to implement a retry mechanism
140-
}
141-
142-
// Create response
143-
StickerRemovalResponse response = new StickerRemovalResponse();
144-
response.setUserId(userId);
145-
response.setStickerId(stickerId);
146-
response.setRemovedAt(Date.from(assignment.getRemovedAt()));
90+
// Publish events - Note: We'll need to modify event publisher to work with DTOs
91+
// For now, skip event publishing until we refactor the event publisher
92+
// try {
93+
// log.info("Publishing sticker removal event for userId={}, stickerId={}", userId, stickerId);
94+
// eventPublisher.publishStickerRemoved(...);
95+
// } catch (Exception e) {
96+
// log.error("Failed to publish sticker removal event", e);
97+
// }
14798

14899
return Response.ok(response).build();
149100
}

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/AssignStickerCommand.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/AssignStickerRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"reason"
1313
})
1414
@Generated("jsonschema2pojo")
15-
public class AssignStickerCommand {
15+
public class AssignStickerRequest {
1616

1717
/**
1818
*

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/StickerAssignmentResponse.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/AssignStickerResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"assignedAt"
1616
})
1717
@Generated("jsonschema2pojo")
18-
public class StickerAssignmentResponse {
18+
public class AssignStickerResponse {
1919

2020
@JsonProperty("userId")
2121
private String userId;

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/UserStickersResponse.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/GetUserStickersResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"stickers"
1515
})
1616
@Generated("jsonschema2pojo")
17-
public class UserStickersResponse {
17+
public class GetUserStickersResponse {
1818

1919
@JsonProperty("userId")
2020
private String userId;
2121
@JsonProperty("stickers")
22-
private List<StickerDTO> stickers = new ArrayList<StickerDTO>();
22+
private List<StickerAssignmentDTO> stickers = new ArrayList<StickerAssignmentDTO>();
2323

2424
@JsonProperty("userId")
2525
public String getUserId() {
@@ -32,12 +32,12 @@ public void setUserId(String userId) {
3232
}
3333

3434
@JsonProperty("stickers")
35-
public List<StickerDTO> getStickers() {
35+
public List<StickerAssignmentDTO> getStickers() {
3636
return stickers;
3737
}
3838

3939
@JsonProperty("stickers")
40-
public void setStickers(List<StickerDTO> stickers) {
40+
public void setStickers(List<StickerAssignmentDTO> stickers) {
4141
this.stickers = stickers;
4242
}
4343

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/StickerRemovalResponse.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/RemoveStickerFromUserResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"removedAt"
1616
})
1717
@Generated("jsonschema2pojo")
18-
public class StickerRemovalResponse {
18+
public class RemoveStickerFromUserResponse {
1919

2020
@JsonProperty("userId")
2121
private String userId;

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/StickerDTO.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/StickerAssignmentDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"assignedAt"
1818
})
1919
@Generated("jsonschema2pojo")
20-
public class StickerDTO {
20+
public class StickerAssignmentDTO {
2121

2222
@JsonProperty("stickerId")
2323
private String stickerId;

sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/UserAssignment.java renamed to sticker-award/src/main/java/com/datadoghq/stickerlandia/stickeraward/award/dto/UserAssignmentDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"assignedAt",
1313
"reason"
1414
})
15-
public class UserAssignment {
15+
public class UserAssignmentDTO {
1616

1717
@JsonProperty("userId")
1818
private String userId;

0 commit comments

Comments
 (0)