jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-05-27 21:17:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use DTO for activity list

Browse Source
This commit is contained in:
Tim
2025-08-12 01:22:26 +08:00
parent f977f96407
commit 499488c22a
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/com/openisle/controller/ActivityController.java
View File

@@ -1,7 +1,9 @@
package com.openisle.controller; package com.openisle.controller;
import com.openisle.dto.ActivityDto;
import com.openisle.dto.MilkTeaInfoDto; import com.openisle.dto.MilkTeaInfoDto;
import com.openisle.dto.MilkTeaRedeemRequest; import com.openisle.dto.MilkTeaRedeemRequest;
import com.openisle.mapper.ActivityMapper;
import com.openisle.model.Activity; import com.openisle.model.Activity;
import com.openisle.model.ActivityType; import com.openisle.model.ActivityType;
import com.openisle.model.User; import com.openisle.model.User;
@@ -12,6 +14,7 @@ import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping("/api/activities") @RequestMapping("/api/activities")
@@ -19,10 +22,13 @@ import java.util.List;
public class ActivityController { public class ActivityController {
private final ActivityService activityService; private final ActivityService activityService;
private final UserService userService; private final UserService userService;
private final ActivityMapper activityMapper;
@GetMapping @GetMapping
public List<Activity> list() { public List<ActivityDto> list() {
return activityService.list(); return activityService.list().stream()
.map(activityMapper::toDto)
.collect(Collectors.toList());
} }
@GetMapping("/milk-tea") @GetMapping("/milk-tea")

21
backend/src/main/java/com/openisle/dto/ActivityDto.java Normal file
View File

@@ -0,0 +1,21 @@
package com.openisle.dto;
import com.openisle.model.ActivityType;
import lombok.Data;
import java.time.LocalDateTime;
/**
* DTO representing an activity without participant details.
*/
@Data
public class ActivityDto {
private Long id;
private String title;
private String icon;
private String content;
private LocalDateTime startTime;
private LocalDateTime endTime;
private ActivityType type;
private boolean ended;
}

23
backend/src/main/java/com/openisle/mapper/ActivityMapper.java Normal file
View File

@@ -0,0 +1,23 @@
package com.openisle.mapper;
import com.openisle.dto.ActivityDto;
import com.openisle.model.Activity;
import org.springframework.stereotype.Component;
/** Mapper for activity entities. */
@Component
public class ActivityMapper {
public ActivityDto toDto(Activity a) {
ActivityDto dto = new ActivityDto();
dto.setId(a.getId());
dto.setTitle(a.getTitle());
dto.setIcon(a.getIcon());
dto.setContent(a.getContent());
dto.setStartTime(a.getStartTime());
dto.setEndTime(a.getEndTime());
dto.setType(a.getType());
dto.setEnded(a.isEnded());
return dto;
}
}