Sma 36 implement the host event page

backend/sportsmatch/src/main/java/com/sportsmatch/SportsmatchApplication.java

@@ -29,6 +29,7 @@ public class SportsmatchApplication implements CommandLineRunner {
   private final EventRepository eventRepository;
   private final PasswordEncoder passwordEncoder;
   private final InitProperties initProperties;
+
   private final RatingRepository ratingRepository;
   private final UserEventRatingRepository userEventRatingRepository;
 

backend/sportsmatch/src/main/java/com/sportsmatch/controllers/EventsController.java

@@ -2,6 +2,7 @@
 
 import com.sportsmatch.dtos.EventDTO;
 import com.sportsmatch.dtos.EventHistoryDTO;
+import com.sportsmatch.dtos.HostEventDTO;
 import com.sportsmatch.dtos.RequestEventDTO;
 import com.sportsmatch.models.Event;
 import com.sportsmatch.services.EventService;
@@ -31,8 +32,8 @@ public ResponseEntity<?> getEvent(@PathVariable("id") Long id) {
   }
 
   @PostMapping("")
-  public ResponseEntity<?> addEvent(@RequestBody @Valid EventDTO eventDTO) {
-    Event newEvent = eventService.createEvent(eventDTO);
+  public ResponseEntity<?> addEvent(@RequestBody @Valid HostEventDTO hostEventDTO) {
+    Event newEvent = eventService.createEvent(hostEventDTO);
     return ResponseEntity.status(HttpStatus.CREATED)
         .body(eventService.getEventDTObyEventId(newEvent.getId()));
   }

backend/sportsmatch/src/main/java/com/sportsmatch/dtos/EventDTO.java

@@ -33,5 +33,6 @@ public class EventDTO {
   private String player1Name;
   private String player2Name;
 
+  @NotNull
   private PlaceDTO placeDTO;
 }

backend/sportsmatch/src/main/java/com/sportsmatch/dtos/HostEventDTO.java

@@ -0,0 +1,30 @@
+package com.sportsmatch.dtos;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class HostEventDTO {
+
+  @NotNull
+  private LocalDateTime dateStart;
+  @NotNull
+  private LocalDateTime dateEnd;
+  @NotNull
+  private Integer minElo;
+  @NotNull
+  private Integer maxElo;
+  @NotBlank
+  private String title;
+  @NotBlank
+  private String sport;
+  @NotNull
+  private Long locationId;
+}

backend/sportsmatch/src/main/java/com/sportsmatch/dtos/PlaceDTO.java

@@ -13,6 +13,8 @@
 @AllArgsConstructor
 public class PlaceDTO {
 
+  private Long id;
+
   @NotBlank
   private String name;
 

backend/sportsmatch/src/main/java/com/sportsmatch/mappers/EventMapper.java

@@ -2,6 +2,7 @@
 
 import com.sportsmatch.dtos.EventDTO;
 import com.sportsmatch.dtos.EventHistoryDTO;
+import com.sportsmatch.dtos.HostEventDTO;
 import com.sportsmatch.models.Event;
 import com.sportsmatch.models.EventPlayer;
 import com.sportsmatch.models.EventStatusOptions;
@@ -44,9 +45,9 @@ public EventDTO convertEventToEventDTO(Event event) {
     return eventDTO;
   }
 
-  public Event convertEventDTOtoEvent(EventDTO eventDTO) {
+  public Event convertHostEventDTOtoEvent(HostEventDTO hostEventDTO) {
     modelMapper.typeMap(EventDTO.class, Event.class).addMappings(e -> e.skip(Event::setId));
-    return modelMapper.map(eventDTO, Event.class);
+    return modelMapper.map(hostEventDTO, Event.class);
   }
 
   /**

backend/sportsmatch/src/main/java/com/sportsmatch/mappers/PlaceMapper.java

@@ -15,6 +15,7 @@ public class PlaceMapper {
    */
   public PlaceDTO toDTO(Place entity) {
     return PlaceDTO.builder()
+        .id(entity.getId())
         .name(entity.getName())
         .address(entity.getAddress())
         .latitude(entity.getLatitude())

backend/sportsmatch/src/main/java/com/sportsmatch/services/EventService.java

@@ -2,14 +2,17 @@
 
 import com.sportsmatch.dtos.EventDTO;
 import com.sportsmatch.dtos.EventHistoryDTO;
+import com.sportsmatch.dtos.HostEventDTO;
 import com.sportsmatch.dtos.RequestEventDTO;
 import com.sportsmatch.mappers.EventMapper;
 import com.sportsmatch.models.Event;
 import com.sportsmatch.models.EventPlayer;
 import com.sportsmatch.models.EventStatusOptions;
+import com.sportsmatch.models.Place;
 import com.sportsmatch.models.User;
 import com.sportsmatch.repositories.EventPlayerRepository;
 import com.sportsmatch.repositories.EventRepository;
+import com.sportsmatch.repositories.PlaceRepository;
 import com.sportsmatch.repositories.SportRepository;
 import com.sportsmatch.repositories.UserRepository;
 import lombok.AllArgsConstructor;
@@ -31,7 +34,7 @@ public class EventService {
   private final UserRepository userRepository;
   private final SportRepository sportRepository;
   private final EventPlayerRepository eventPlayerRepository;
-
+  private final PlaceRepository placeRepository;
 
   public Event getEventById(Long id) {
     return eventRepository
@@ -79,23 +82,18 @@ public EventPlayer addPlayerToEvent(Long playerId, Long eventId) {
     return eventPlayerRepository.save(eventPlayer);
   }
 
-  public Event createEvent(EventDTO eventDTO) {
-    Event newEvent = eventMapper.convertEventDTOtoEvent(eventDTO);
+  public Event createEvent(HostEventDTO hostEventDTO) {
+    User user = userService.getUserFromContext();
+    Event newEvent = eventMapper.convertHostEventDTOtoEvent(hostEventDTO);
+    Place place = placeRepository.findById(hostEventDTO.getLocationId()).orElseThrow();
+    newEvent.setPlace(place);
     newEvent.setSport(
         sportRepository
-            .findSportByName(eventDTO.getSport())
+            .findSportByName(hostEventDTO.getSport())
             .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST)));
     newEvent = eventRepository.save(newEvent);
-
-    Set<EventPlayer> players = new HashSet<>();
-    if (eventDTO.getPlayer1Id() != null) {
-      players.add(addPlayerToEvent(eventDTO.getPlayer1Id(), newEvent.getId()));
-    }
-    if (eventDTO.getPlayer2Id() != null) {
-      players.add(addPlayerToEvent(eventDTO.getPlayer2Id(), newEvent.getId()));
-    }
-
-    newEvent.setPlayers(players);
+    EventPlayer userPlayer = new EventPlayer(null, null, user, newEvent);
+    eventPlayerRepository.save(userPlayer);
     return newEvent;
   }
 
@@ -107,7 +105,8 @@ public void deleteEventFromDatabase(Event eventById) {
    * Retrieves the event history of the logged-in user.
    *
    * @param pageable contains the pagination information (page, size)
-   * @return a list of EventHistoryDTOs representing the logged-in user's event history
+   * @return a list of EventHistoryDTOs representing the logged-in user's event history$ ../gradlew
+   *     clean checkStyleMain -info
    */
   public List<EventHistoryDTO> getEventsHistory(final Pageable pageable) {
     String loggedUserName = userService.getUserFromContext().getName();
@@ -122,12 +121,10 @@ public List<EventHistoryDTO> getEventsHistory(final Pageable pageable) {
    * Returns the checked status of the match (check the score is matching or missing).
    *
    * @param players who entered the event (2 playerEvent)
-   * @return the status of the match
-   *     There is 4 option:
-   *     - Invalid Player -> if one of the player don't present.
-   *     - Waiting for ratings -> if one of the players doesn't response with the score information.
-   *     - Match -> when both player submitted their result and it is match.
-   *     - Mismatch -> when both players have submitted their result, and it isn't a match.
+   * @return the status of the match There is 4 option: - Invalid Player -> if one of the player
+   *     don't present. - Waiting for ratings -> if one of the players doesn't response with the
+   *     score information. - Match -> when both player submitted their result and it is match. -
+   *     Mismatch -> when both players have submitted their result, and it isn't a match.
    */
   public EventStatusOptions checkScoreMatch(Set<EventPlayer> players) {
 
@@ -187,18 +184,26 @@ public void joinEvent(Long id) throws Exception {
   }
 
   /**
-   * Finds events near the provided location and filters them based on optional sport names filters, returning a page of event data transfer objects (DTOs).
+   * Finds events near the provided location and filters them based on optional sport names filters,
+   * returning a page of event data transfer objects (DTOs).
    *
    * @param requestEventDTO containing the request parameters for filtering events.
-   * @param pageable        containing page and size
-   * @return a list of EventDTO representing Events entity and filtered by sport names is given, and coordinate.
+   * @param pageable containing page and size
+   * @return a list of EventDTO representing Events entity and filtered by sport names is given, and
+   *     coordinate.
    */
   public List<EventDTO> getNearbyEvents(RequestEventDTO requestEventDTO, final Pageable pageable) {
 
     // Convert the given sportNames to lowercase because of the native custom query
-    List<String> sportNamesWithLowerCase = requestEventDTO.getSportsName().stream().map(String::toLowerCase).toList();
-
-    List<Event> events = eventRepository.findNearbyEvents(requestEventDTO.getLongitude(), requestEventDTO.getLatitude(), sportNamesWithLowerCase, pageable);
+    List<String> sportNamesWithLowerCase =
+        requestEventDTO.getSportsName().stream().map(String::toLowerCase).toList();
+
+    List<Event> events =
+        eventRepository.findNearbyEvents(
+            requestEventDTO.getLongitude(),
+            requestEventDTO.getLatitude(),
+            sportNamesWithLowerCase,
+            pageable);
 
     return events.stream().map(eventMapper::convertEventToEventDTO).collect(Collectors.toList());
   }