Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.pecacm.backend.enums.EventRole;
import com.pecacm.backend.exception.AcmException;
import com.pecacm.backend.model.EndEventDetails;
import com.pecacm.backend.model.EndEventSidDetails;
import com.pecacm.backend.response.EventAttendeesResponse;
import com.pecacm.backend.services.EventService;
import jakarta.annotation.Nonnull;
Expand Down Expand Up @@ -132,6 +133,13 @@ public ResponseEntity<Void> endEvent(@PathVariable Integer eventId, @RequestBody
return ResponseEntity.ok().build();
}

@PostMapping("/{eventId}/end/sid")
@PreAuthorize(Constants.HAS_ROLE_CORE_AND_ABOVE)
public ResponseEntity<Void> endEventBySid(@PathVariable Integer eventId, @RequestBody EndEventSidDetails endEventSidDetails) {
eventService.endEventBySid(eventId, endEventSidDetails);
return ResponseEntity.ok().build();
}

@GetMapping("/next")
@PreAuthorize(Constants.HAS_ANY_ROLE)
public ResponseEntity<Event> nextEvent(@RequestParam("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @Nonnull LocalDate date) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/pecacm/backend/model/EndEventDetails.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.Builder;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -13,6 +14,7 @@
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class EndEventDetails {
private List<String> contributors = new ArrayList<>();
private List<String> publicity = new ArrayList<>();
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/com/pecacm/backend/model/EndEventSidDetails.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.pecacm.backend.model;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.ArrayList;
import java.util.List;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class EndEventSidDetails {
private List<String> contributors = new ArrayList<>();
private List<String> publicity = new ArrayList<>();
private List<Integer> participants = new ArrayList<>();
private Integer contributorXp = 5;
private Integer publicityXp = 2;
private Integer participantXp = 1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ public interface UserRepository extends JpaRepository<User, Integer> {

List<User> findByEmailIn(List<String> emails);

List<User> findBySidIn(List<Integer> sids);

}
23 changes: 22 additions & 1 deletion src/main/java/com/pecacm/backend/services/EventService.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.pecacm.backend.enums.EventRole;
import com.pecacm.backend.exception.AcmException;
import com.pecacm.backend.model.EndEventDetails;
import com.pecacm.backend.model.EndEventSidDetails;
import com.pecacm.backend.repository.EventRepository;
import com.pecacm.backend.repository.TransactionRepository;
import com.pecacm.backend.repository.UserRepository;
Expand All @@ -20,7 +21,10 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

@Service
public class EventService {
Expand Down Expand Up @@ -126,6 +130,23 @@ public void endEvent(Integer eventId, EndEventDetails endEventDetails) {
eventRepository.save(event);
}

@Transactional
public void endEventBySid(Integer eventId, EndEventSidDetails endEventSidDetails) {
List<String> participants = userRepository.findBySidIn(endEventSidDetails.getParticipants())
.stream()
.map(User::getEmail)
.toList();
EndEventDetails endEventDetails = EndEventDetails.builder()
.contributors(endEventSidDetails.getContributors())
.publicity(endEventSidDetails.getPublicity())
.participants(participants)
.contributorXp(endEventSidDetails.getContributorXp())
.publicityXp(endEventSidDetails.getPublicityXp())
.participantXp(endEventSidDetails.getParticipantXp())
.build();
endEvent(eventId, endEventDetails);
}

private void updateEventRoles(List<String> emails, EventRole eventRole, Event event, EndEventDetails endEventDetails) {
List<User> users = userRepository.findByEmailIn(emails);

Expand Down