Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fahrgemeinschaft be #155

Merged
merged 4 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
@@ -0,0 +1,70 @@
package com.dhbw.get2gether.backend.widget.adapter.in;

import com.dhbw.get2gether.backend.event.model.Event;
import com.dhbw.get2gether.backend.widget.application.CarpoolWidgetService;
import com.dhbw.get2gether.backend.widget.model.carpool.CarAddCommand;
import com.dhbw.get2gether.backend.widget.model.carpool.CarpoolCreateCommand;
import com.dhbw.get2gether.backend.widget.model.carpool.CarpoolWidget;
import com.dhbw.get2gether.backend.widget.model.carpool.RiderAddCommand;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/event/{eventId}/widgets/carpool")
public class CarpoolWidgetController {

public CarpoolWidgetService service;

public CarpoolWidgetController (CarpoolWidgetService service){
this.service = service;
}

@PostMapping("/")
public Event createCarpoolWidget(
@AuthenticationPrincipal OAuth2User principal,
@PathVariable String eventId,
@RequestBody CarpoolCreateCommand createCommand
) {
return service.createCarpoolWidget(principal, eventId, createCommand);

Check warning on line 29 in backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java#L29

Added line #L29 was not covered by tests
}
@PostMapping("/{widgetId}/cars")
public CarpoolWidget addCar(
@AuthenticationPrincipal OAuth2User principal,
@PathVariable String eventId,
@PathVariable String widgetId,
@RequestBody CarAddCommand addCommand
) {
return service.addCar(principal, eventId, widgetId, addCommand);

Check warning on line 38 in backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java#L38

Added line #L38 was not covered by tests
}
@DeleteMapping("/{widgetId}/cars/{carId}")
public CarpoolWidget removeCar(
@AuthenticationPrincipal OAuth2User principal,
@PathVariable String eventId,
@PathVariable String widgetId,
@PathVariable String carId
) {
return service.removeCar(principal, eventId, widgetId, carId);

Check warning on line 47 in backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java#L47

Added line #L47 was not covered by tests
}
@PostMapping("/{widgetId}/cars/{carId}")
public CarpoolWidget addRider(
@AuthenticationPrincipal OAuth2User principal,
@PathVariable String eventId,
@PathVariable String widgetId,
@PathVariable String carId,
@RequestBody RiderAddCommand addCommand
) {
return service.addRider(principal, eventId, widgetId,carId, addCommand);

Check warning on line 57 in backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java#L57

Added line #L57 was not covered by tests
}
@DeleteMapping("/{widgetId}/cars/{carId}/riders/{riderId}")
public CarpoolWidget removeRider(
@AuthenticationPrincipal OAuth2User principal,
@PathVariable String eventId,
@PathVariable String widgetId,
@PathVariable String carId,
@PathVariable String riderId
) {
return service.removeRider(principal, eventId, widgetId, carId, riderId);

Check warning on line 67 in backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/CarpoolWidgetController.java#L67

Added line #L67 was not covered by tests
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package com.dhbw.get2gether.backend.widget.application;

import com.dhbw.get2gether.backend.event.application.EventService;
import com.dhbw.get2gether.backend.event.model.Event;
import com.dhbw.get2gether.backend.exceptions.EntityNotFoundException;
import com.dhbw.get2gether.backend.user.application.UserService;
import com.dhbw.get2gether.backend.widget.application.mapper.CarpoolWidgetMapper;
import com.dhbw.get2gether.backend.widget.model.carpool.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.AuthenticatedPrincipal;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.Objects;
import java.util.UUID;

@Service
public class CarpoolWidgetService extends AbstractWidgetService{

private final CarpoolWidgetMapper mapper;
private final UserService userService;

CarpoolWidgetService(EventService eventService, CarpoolWidgetMapper mapper, UserService userService) {
super(eventService);
this.mapper = mapper;
this.userService = userService;
}

@PreAuthorize("hasRole('USER')")
public Event createCarpoolWidget(AuthenticatedPrincipal principal, String eventId, CarpoolCreateCommand createCommand) {
Event event = getEventById(principal, eventId);
CarpoolWidget widget = mapper.mapToCarpoolWidget(createCommand).toBuilder()
.id(UUID.randomUUID().toString())
.creationDate(LocalDateTime.now())
.build();
return addWidget(principal, event, widget);
}

@PreAuthorize("hasRole('USER')")
public CarpoolWidget addCar(AuthenticatedPrincipal principal, String eventId, String widgetId, CarAddCommand addCommand) {
Event event = getEventById(principal, eventId);
CarpoolWidget widget = getWidgetFromEvent(event, widgetId);
Car car = mapper.mapToCar(addCommand).toBuilder()
.id(UUID.randomUUID().toString())
.driverId(userService.getUserByPrincipal(principal).getId())
.build();

widget.addCar(car);
return updateAndGetWidget(principal, event, widget);
}
@PreAuthorize("hasRole('USER')")
public CarpoolWidget removeCar(AuthenticatedPrincipal principal, String eventId, String widgetId, String carId) {
Event event = getEventById(principal, eventId);
CarpoolWidget widget = getWidgetFromEvent(event, widgetId);
Car car = widget.getCars().stream()
.filter(c -> Objects.equals(c.getId(), carId)).findFirst()
.orElseThrow(() -> new EntityNotFoundException("Car not found"));
if (!widget.removeCar(car)) {
throw new IllegalStateException("Failed to remove Car from Carpool widget");

Check warning on line 59 in backend/src/main/java/com/dhbw/get2gether/backend/widget/application/CarpoolWidgetService.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/application/CarpoolWidgetService.java#L59

Added line #L59 was not covered by tests
}
return updateAndGetWidget(principal, event, widget);
}
@PreAuthorize("hasRole('USER')")
public CarpoolWidget addRider(AuthenticatedPrincipal principal, String eventId, String widgetId, String carId, RiderAddCommand addCommand) {
Event event = getEventById(principal, eventId);
CarpoolWidget widget = getWidgetFromEvent(event, widgetId);
Car car = widget.getCars().stream()
.filter(c -> Objects.equals(c.getId(), carId)).findFirst()
.orElseThrow(() -> new EntityNotFoundException("Car not found"));
Rider rider = mapper.mapToRider(addCommand).toBuilder()
.id(UUID.randomUUID().toString())
.userId(userService.getUserByPrincipal(principal).getId())
.build();
car.addRider(rider);
widget.addCar(car);
ebauersandoval marked this conversation as resolved.
Show resolved Hide resolved
return updateAndGetWidget(principal, event, widget);
}
@PreAuthorize("hasRole('USER')")
public CarpoolWidget removeRider(AuthenticatedPrincipal principal, String eventId, String widgetId, String carId, String riderId) {
Event event = getEventById(principal, eventId);
CarpoolWidget widget = getWidgetFromEvent(event, widgetId);
Car car = widget.getCars().stream()
.filter(c -> Objects.equals(c.getId(), carId)).findFirst()
.orElseThrow(() -> new EntityNotFoundException("Car not found"));
Rider rider = car.getRiders().stream()
.filter(r -> Objects.equals(r.getId(), riderId)).findFirst()
.orElseThrow(() -> new EntityNotFoundException("Rider not found"));
if (!car.removeRider(rider)) {
throw new IllegalStateException("Failed to remove rider from car");

Check warning on line 89 in backend/src/main/java/com/dhbw/get2gether/backend/widget/application/CarpoolWidgetService.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/application/CarpoolWidgetService.java#L89

Added line #L89 was not covered by tests
}
return updateAndGetWidget(principal, event, widget);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.dhbw.get2gether.backend.widget.application.mapper;

import com.dhbw.get2gether.backend.widget.model.carpool.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;

@Mapper(componentModel = "spring")
public interface CarpoolWidgetMapper {
@Mapping(target = "id", ignore = true)
@Mapping(target = "creationDate", ignore = true)
@Mapping(target = "cars", ignore = true)
CarpoolWidget mapToCarpoolWidget(CarpoolCreateCommand createCommand);

@Mapping(target = "id", ignore = true)
@Mapping(target = "driverId", ignore = true)
@Mapping(target = "riders", ignore = true)
Car mapToCar(CarAddCommand command);

@Mapping(target = "id", ignore = true)
@Mapping(target = "userId", ignore = true)
Rider mapToRider(RiderAddCommand command);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.dhbw.get2gether.backend.widget.model.carpool;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

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

@Builder(toBuilder = true)
@Getter
@AllArgsConstructor
public class Car {
private String id;
private String driverId;
private String driverAdress;
private int anzahlPlaetze;
@Builder.Default
private List<Rider> riders = new ArrayList<>();

public void addRider(Rider rider) {
riders.add(rider);
}

public boolean removeRider(Rider rider) {
return riders.remove(rider);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.dhbw.get2gether.backend.widget.model.carpool;


import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@AllArgsConstructor
@Builder(toBuilder = true)
public class CarAddCommand {
private String driverAdress;
private int anzahlPlaetze;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.dhbw.get2gether.backend.widget.model.carpool;

import com.dhbw.get2gether.backend.widget.model.map.Location;
import com.dhbw.get2gether.backend.widget.model.map.LocationAddCommand;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@AllArgsConstructor
@Builder(toBuilder = true)

Check warning on line 11 in backend/src/main/java/com/dhbw/get2gether/backend/widget/model/carpool/CarpoolCreateCommand.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/com/dhbw/get2gether/backend/widget/model/carpool/CarpoolCreateCommand.java#L11

Added line #L11 was not covered by tests
public class CarpoolCreateCommand {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.dhbw.get2gether.backend.widget.model.carpool;

import com.dhbw.get2gether.backend.widget.model.Widget;
import com.dhbw.get2gether.backend.widget.model.WidgetType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

@Builder(toBuilder = true)
@Getter
@AllArgsConstructor
public class CarpoolWidget extends Widget {
private String id;
private final LocalDateTime creationDate;
@Builder.Default
private List<Car> cars = new ArrayList<>();

@Override
public LocalDateTime getCreationDate() {
return creationDate;
}

@Override
public WidgetType getWidgetType() {
return WidgetType.CARPOOL;
}
public void addCar(Car car) {
cars.add(car);
}

public boolean removeCar(Car car) {
return cars.remove(car);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.dhbw.get2gether.backend.widget.model.carpool;

import com.dhbw.get2gether.backend.widget.model.map.Location;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Builder(toBuilder = true)
@Getter
@AllArgsConstructor
public class Rider {
private final String id;
private final String userId;
private final String pickupPlace;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.dhbw.get2gether.backend.widget.model.carpool;

import com.dhbw.get2gether.backend.widget.model.map.Location;
import com.dhbw.get2gether.backend.widget.model.map.LocationAddCommand;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Builder(toBuilder = true)
@Getter
@AllArgsConstructor
public class RiderAddCommand {
private final String pickupPlace;
}
Loading
Loading