Skip to content

Commit 40031f8

Browse files
Konstantin PankratovKonstantin Pankratov
authored andcommitted
Change dataflow
1 parent 0381611 commit 40031f8

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.studybuddies.server.web.dto.module;
22

33
import com.studybuddies.server.web.dto.interfaces.Responses;
4+
import lombok.AllArgsConstructor;
45
import lombok.Getter;
56

67
@Getter
8+
@AllArgsConstructor
79
public class ModuleResponse implements Responses {
810
public String name;
911
}

server/src/main/java/com/studybuddies/server/web/dto/user/UserResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.studybuddies.server.web.dto.user;
22

33
import com.studybuddies.server.web.dto.interfaces.Responses;
4+
import com.studybuddies.server.web.dto.module.ModuleResponse;
45
import java.util.List;
56
import lombok.Getter;
67
import lombok.RequiredArgsConstructor;
@@ -13,5 +14,5 @@ public class UserResponse implements Responses {
1314

1415
String uuid;
1516
String username;
16-
List<String> modules;
17+
List<ModuleResponse> modules;
1718
}

server/src/main/java/com/studybuddies/server/web/mapper/UserMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import org.mapstruct.Mapper;
77
import org.mapstruct.Mapping;
88

9-
@Mapper(componentModel = "spring")
9+
@Mapper(componentModel = "spring", uses = {UserMapperUtils.class})
1010
public interface UserMapper {
1111

1212
@Mapping(source = "username", target = "username")
1313
UserEntity of(UserAccountSetupRequest userAccountSetupRequest);
1414

1515
@Mapping(source = "uuid", target = "uuid")
1616
@Mapping(source = "username", target = "username")
17-
@Mapping(source = "modules", target = "modules")
17+
@Mapping(source = "modules", target = "modules", qualifiedByName = "stringListToRespList")
1818
UserResponse of(UserEntity userEntity);
1919
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.studybuddies.server.web.mapper;
2+
3+
import com.studybuddies.server.web.dto.module.ModuleResponse;
4+
import java.util.ArrayList;
5+
import java.util.List;
6+
import org.mapstruct.Named;
7+
import org.springframework.stereotype.Component;
8+
9+
@Component
10+
public class UserMapperUtils {
11+
12+
@Named("stringListToRespList")
13+
public List<ModuleResponse> stringListToRespList(List<String> stringList) {
14+
List<ModuleResponse> respList = new ArrayList<>();
15+
for (String s : stringList) {
16+
respList.add(new ModuleResponse(s));
17+
}
18+
return respList;
19+
}
20+
}

0 commit comments

Comments
 (0)