Feature/kob 66 angebote stadtweit

.gitignore

@@ -29,3 +29,4 @@ dist/
 nbdist/
 .nb-gradle/
 
+.vscode/

pom.xml

@@ -164,6 +164,8 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>5.4.32.Final</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>

src/main/java/de/muenchen/kobit/backend/MicroServiceApplication.java

@@ -9,6 +9,7 @@
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import io.swagger.v3.oas.annotations.Hidden;
+import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -37,6 +38,7 @@ public class MicroServiceApplication implements WebMvcConfigurer {
 
     public static void main(String[] args) {
         System.setProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "true");
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
         SpringApplication.run(MicroServiceApplication.class, args);
     }
 

src/main/java/de/muenchen/kobit/backend/contactpoint/model/ContactPoint.java

@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.util.List;
 import java.util.UUID;
+import javax.annotation.Nullable;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
@@ -54,6 +55,7 @@ public class ContactPoint {
 
     // Add Image Link as a column
     @Column(name = "image")
+    @Nullable
     private URL image;
 
     public ContactPoint(

src/main/java/de/muenchen/kobit/backend/contactpoint/service/ContactPointCreationService.java

@@ -12,7 +12,7 @@
 import de.muenchen.kobit.backend.contactpoint.view.ContactPointView;
 import de.muenchen.kobit.backend.links.service.LinkService;
 import de.muenchen.kobit.backend.links.view.LinkView;
-import de.muenchen.kobit.backend.validation.Validator;
+import de.muenchen.kobit.backend.validation.ContactPointValidator;
 import de.muenchen.kobit.backend.validation.exception.ContactPointValidationException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,15 +32,15 @@ public class ContactPointCreationService {
     private final LinkService linkService;
     private final CompetenceService competenceService;
     private final AdminService adminService;
-    private final List<Validator> validators;
+    private final List<ContactPointValidator> validators;
 
     ContactPointCreationService(
             ContactPointRepository contactPointRepository,
             ContactService contactService,
             LinkService linkService,
             CompetenceService competenceService,
             AdminService adminService,
-            List<Validator> validators) {
+            List<ContactPointValidator> validators) {
         this.contactPointRepository = contactPointRepository;
         this.contactService = contactService;
         this.linkService = linkService;
@@ -59,7 +59,7 @@ public ContactPointView createContactPoint(ContactPointView contactPointView)
             throw new ResponseStatusException(
                     HttpStatus.BAD_REQUEST, "The User has not the needed permission!");
         }
-        for (Validator validator : validators) {
+        for (ContactPointValidator validator : validators) {
             validator.validate(contactPointView);
         }
         ContactPoint newContactPoint = createNewContactPoint(contactPointView);

src/main/java/de/muenchen/kobit/backend/contactpoint/service/ContactPointManipulationService.java

@@ -18,7 +18,7 @@
 import de.muenchen.kobit.backend.links.model.Link;
 import de.muenchen.kobit.backend.links.service.LinkService;
 import de.muenchen.kobit.backend.links.view.LinkView;
-import de.muenchen.kobit.backend.validation.Validator;
+import de.muenchen.kobit.backend.validation.ContactPointValidator;
 import de.muenchen.kobit.backend.validation.exception.ContactPointValidationException;
 import de.muenchen.kobit.backend.validation.exception.contactpoint.InvalidCompetenceException;
 import de.muenchen.kobit.backend.validation.exception.contactpoint.InvalidContactPointException;
@@ -45,15 +45,15 @@ public class ContactPointManipulationService {
     private final AdminService adminService;
     private final RelevanceService relevanceService;
 
-    private final List<Validator> validators;
+    private final List<ContactPointValidator> validators;
 
     ContactPointManipulationService(
             ContactPointRepository contactPointRepository,
             ContactService contactService,
             LinkService linkService,
             CompetenceService competenceService,
             AdminService adminService,
-            List<Validator> validators,
+            List<ContactPointValidator> validators,
             RelevanceService relevanceService) {
         this.contactPointRepository = contactPointRepository;
         this.contactService = contactService;
@@ -100,7 +100,7 @@ public ContactPointView updateContactPoint(ContactPointView contactPointView, UU
         if (contactPointView.getLinks() == null) {
             contactPointView.setLinks(Collections.emptyList());
         }
-        for (Validator validator : validators) {
+        for (ContactPointValidator validator : validators) {
             validator.validate(contactPointView);
         }
         if (!isUserAuthorized(contactPointView.getDepartments())) {

src/main/java/de/muenchen/kobit/backend/offer/api/OfferController.java

@@ -0,0 +1,58 @@
+package de.muenchen.kobit.backend.offer.api;
+
+import de.muenchen.kobit.backend.offer.service.OfferCreationService;
+import de.muenchen.kobit.backend.offer.service.OfferDeletionService;
+import de.muenchen.kobit.backend.offer.service.OfferManipulationService;
+import de.muenchen.kobit.backend.offer.service.OfferService;
+import de.muenchen.kobit.backend.offer.view.OfferView;
+import de.muenchen.kobit.backend.validation.exception.OfferValidationException;
+import java.util.List;
+import java.util.UUID;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/offers")
+public class OfferController {
+
+    private final OfferService offerService;
+    private final OfferManipulationService manipulationService;
+    private final OfferCreationService creationService;
+    private final OfferDeletionService deletionService;
+
+    public OfferController(
+            OfferService offerService,
+            OfferManipulationService manipulationService,
+            OfferCreationService creationService,
+            OfferDeletionService deletionService) {
+        this.offerService = offerService;
+        this.manipulationService = manipulationService;
+        this.creationService = creationService;
+        this.deletionService = deletionService;
+    }
+
+    @GetMapping
+    public List<OfferView> getOfferList() {
+        return offerService.getOfferList();
+    }
+
+    @GetMapping("/{id}")
+    public OfferView getOfferById(@PathVariable UUID id) {
+        return offerService.findById(id);
+    }
+
+    @PostMapping
+    public OfferView createOffer(@RequestBody OfferView offerView) throws OfferValidationException {
+        return creationService.createOffer(offerView);
+    }
+
+    @PutMapping("/{id}")
+    public OfferView updateOffer(@PathVariable UUID id, @RequestBody OfferView offerView)
+            throws OfferValidationException {
+        return manipulationService.updateOffer(offerView, id);
+    }
+
+    @DeleteMapping("/{id}")
+    public void deleteOffer(@PathVariable UUID id) {
+        deletionService.deleteOffer(id);
+    }
+}

src/main/java/de/muenchen/kobit/backend/offer/model/Offer.java

@@ -0,0 +1,65 @@
+package de.muenchen.kobit.backend.offer.model;
+
+import de.muenchen.kobit.backend.offer.view.OfferView;
+import java.net.URL;
+import java.sql.Date;
+import java.util.UUID;
+import javax.annotation.Nullable;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.GenericGenerator;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "offer")
+public class Offer {
+
+    @Id
+    @NotNull
+    @GeneratedValue(generator = "UUID")
+    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
+    private UUID id;
+
+    @Nullable
+    @Column(name = "start_date")
+    private Date startDate;
+
+    @Nullable
+    @Column(name = "end_date")
+    private Date endDate;
+
+    @NotNull
+    @Column(length = 255)
+    private String title;
+
+    @NotNull
+    @Column(columnDefinition = "TEXT")
+    private String description;
+
+    @NotNull
+    @Column(name = "image_link", length = 2048)
+    private URL imageLink;
+
+    public Offer(Date startDate, Date endDate, String title, String description, URL imageLink) {
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.title = title;
+        this.description = description;
+        this.imageLink = imageLink;
+    }
+
+    public OfferView toListView() {
+        return new OfferView(id, startDate, endDate, title, description, imageLink);
+    }
+
+    public OfferView toView() {
+        return new OfferView(id, startDate, endDate, title, description, imageLink);
+    }
+}

src/main/java/de/muenchen/kobit/backend/offer/repository/OfferRepository.java

@@ -0,0 +1,11 @@
+package de.muenchen.kobit.backend.offer.repository;
+
+import de.muenchen.kobit.backend.offer.model.Offer;
+import java.util.List;
+import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OfferRepository extends JpaRepository<Offer, UUID> {
+
+    List<Offer> findAllByOrderByStartDateAsc();
+}

src/main/java/de/muenchen/kobit/backend/offer/service/OfferCreationService.java

@@ -0,0 +1,51 @@
+package de.muenchen.kobit.backend.offer.service;
+
+import de.muenchen.kobit.backend.admin.service.AdminService;
+import de.muenchen.kobit.backend.offer.model.Offer;
+import de.muenchen.kobit.backend.offer.repository.OfferRepository;
+import de.muenchen.kobit.backend.offer.view.OfferView;
+import de.muenchen.kobit.backend.validation.OfferValidator;
+import de.muenchen.kobit.backend.validation.exception.OfferValidationException;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class OfferCreationService {
+
+    private final OfferRepository offerRepository;
+    private final AdminService adminService;
+    private final List<OfferValidator> validators;
+
+    public OfferCreationService(
+            OfferRepository offerRepository,
+            AdminService adminService,
+            List<OfferValidator> validators) {
+        this.offerRepository = offerRepository;
+        this.adminService = adminService;
+        this.validators = validators;
+    }
+
+    @Transactional
+    public OfferView createOffer(OfferView offerView) throws OfferValidationException {
+        // Perform validation using the registered validators
+        for (OfferValidator validator : validators) {
+            validator.validate(offerView);
+        }
+
+        // Check for admin rights or perform any admin-related operations here
+
+        Offer newOffer = createNewOffer(offerView);
+        return new OfferView(
+                newOffer.getId(),
+                newOffer.getStartDate(),
+                newOffer.getEndDate(),
+                newOffer.getTitle(),
+                newOffer.getDescription(),
+                newOffer.getImageLink());
+    }
+
+    private Offer createNewOffer(OfferView offerView) {
+        return offerRepository.save(offerView.toOffer());
+    }
+}

src/main/java/de/muenchen/kobit/backend/offer/service/OfferDeletionService.java

@@ -0,0 +1,22 @@
+package de.muenchen.kobit.backend.offer.service;
+
+import de.muenchen.kobit.backend.offer.repository.OfferRepository;
+import java.util.UUID;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class OfferDeletionService {
+
+    private final OfferRepository offerRepository;
+
+    public OfferDeletionService(OfferRepository offerRepository) {
+        this.offerRepository = offerRepository;
+    }
+
+    @Transactional
+    public void deleteOffer(UUID id) {
+
+        offerRepository.deleteById(id);
+    }
+}