[NO_REF] Various changes

Author: akos-hrvth

src/main/java/com/getourguide/interview/controller/ActivitiesController.java

@@ -1,23 +1,32 @@
 package com.getourguide.interview.controller;
 
-import com.getourguide.interview.dto.Activity;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
+import com.getourguide.interview.dto.ActivityDto;
+import com.getourguide.interview.service.ActivityService;
 import java.util.List;
+import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 @Controller
+@AllArgsConstructor
 public class ActivitiesController {
 
-    @PersistenceContext
-    private EntityManager entityManager;
+    private final ActivityService activityService;
 
     @GetMapping("/activities")
-    public ResponseEntity<String> activities() {
-        List<Activity> resultList = (List<Activity>) entityManager.createNativeQuery("SELECT * FROM GETYOURGUIDE.ACTIVITY", Activity.class).getResultList();
-        return ResponseEntity.ok(resultList.toString());
+    public ResponseEntity<List<ActivityDto>> activities() {
+        return ResponseEntity.ok(activityService.getActivities());
     }
 
+    @GetMapping("/activities/{id}")
+    public ResponseEntity<ActivityDto> activities(@PathVariable Long id) {
+        return ResponseEntity.ok(activityService.getActivities(id));
+    }
+
+    @GetMapping("/activities/search/{search}")
+    public ResponseEntity<List<ActivityDto>> activitiesSearch(@PathVariable String search) {
+        return ResponseEntity.ok(activityService.searchActivities(search));
+    }
 }

src/main/java/com/getourguide/interview/controller/SupplierController.java

@@ -1,6 +1,6 @@
 package com.getourguide.interview.controller;
 
-import com.getourguide.interview.dto.Supplier;
+import com.getourguide.interview.entity.Supplier;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.util.List;
@@ -25,10 +25,7 @@ public ResponseEntity<List<Supplier>> suppliers() {
     public ResponseEntity<List<Supplier>> suppliersSearch(@PathVariable String search) {
         var list = (List<Supplier>) entityManager.createNativeQuery("SELECT * FROM GETYOURGUIDE.SUPPLIER", Supplier.class).getResultList();
         for(Supplier s: list) {
-            String sb =
-                new StringBuilder().append(s.getName()).append(s.getAddress()).append(s.getZip()).append(s.getCity())
-                    .append(s.getCountry()).toString();
-            if(sb.contains(search)) {
+            if(new StringBuilder().append(s.getName()).append(s.getAddress()).append(s.getZip()).append(s.getCity()).append(s.getCountry()).toString().contains(search)) {
                 return ResponseEntity.ok(List.of(s));
             }
         }

src/main/java/com/getourguide/interview/dto/ActivityDto.java

@@ -0,0 +1,18 @@
+package com.getourguide.interview.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+public class ActivityDto {
+    private Long id;
+    private String title;
+    private int price;
+    private String currency;
+    private double rating;
+    private boolean specialOffer;
+    private String supplierName;
+}

src/main/java/com/getourguide/interview/dto/Activity.java renamed to src/main/java/com/getourguide/interview/entity/Activity.java

@@ -1,16 +1,20 @@
-package com.getourguide.interview.dto;
+package com.getourguide.interview.entity;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 
 @Data
 @Entity
-@Table(name = "getyourguide.activity")
+@Table(schema = "getyourguide", name = "activity")
 @NoArgsConstructor
 public class Activity {
     @Id
@@ -21,4 +25,7 @@ public class Activity {
     private String currency;
     private double rating;
     private boolean specialOffer;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @NotFound(action = NotFoundAction.IGNORE)
+    private Supplier supplier;
 }

src/main/java/com/getourguide/interview/dto/Supplier.java renamed to src/main/java/com/getourguide/interview/entity/Supplier.java

@@ -1,14 +1,16 @@
-package com.getourguide.interview.dto;
+package com.getourguide.interview.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.List;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @Entity
-@Table(name = "getyourguide.supplier")
+@Table(schema="getyourguide", name = "supplier")
 @NoArgsConstructor
 public class Supplier {
     @Id
@@ -18,4 +20,6 @@ public class Supplier {
     private String zip;
     private String city;
     private String country;
+    @OneToMany(mappedBy = "supplier")
+    private List<Activity> activities;
 }

src/main/java/com/getourguide/interview/repository/ActivityRepository.java

@@ -0,0 +1,9 @@
+package com.getourguide.interview.repository;
+
+import com.getourguide.interview.entity.Activity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ActivityRepository extends JpaRepository<Activity, Long> {
+}

src/main/java/com/getourguide/interview/service/ActivityService.java

@@ -0,0 +1,68 @@
+package com.getourguide.interview.service;
+
+import com.getourguide.interview.controller.SupplierController;
+import com.getourguide.interview.dto.ActivityDto;
+import com.getourguide.interview.entity.Activity;
+import com.getourguide.interview.repository.ActivityRepository;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ActivityService {
+    private final ActivityRepository activityRepository;
+    private final SupplierController supplierController;
+    public List<ActivityDto> getActivities() {
+        List<Activity> activities = activityRepository.findAll();
+        List<ActivityDto> result = new ArrayList<>();
+        activities.stream().forEach(activity -> {
+            result.add(ActivityDto.builder()
+                    .id(activity.getId())
+                    .title(activity.getTitle())
+                    .price(activity.getPrice())
+                    .currency(activity.getCurrency())
+                    .rating(activity.getRating())
+                    .specialOffer(activity.isSpecialOffer())
+                    .supplierName(Objects.isNull(activity.getSupplier()) ? "" : activity.getSupplier().getName())
+                    .build());
+        });
+        return result;
+    }
+
+    public ActivityDto getActivities(Long activityId) {
+        List<Activity> activities = activityRepository.findAll();
+        List<ActivityDto> result = new ArrayList<>();
+        activities.stream().filter(activity -> activityId.equals(activity.getId())).forEach(activity -> {
+            result.add(ActivityDto.builder()
+                .id(activity.getId())
+                .title(activity.getTitle())
+                .price(activity.getPrice())
+                .currency(activity.getCurrency())
+                .rating(activity.getRating())
+                .specialOffer(activity.isSpecialOffer())
+                .supplierName(activity.getSupplier().getName())
+                .build());
+        });
+        return result.get(0);
+    }
+
+    public List<ActivityDto> searchActivities(String search) {
+        List<Activity> activities = activityRepository.findAll();
+        List<ActivityDto> result = new ArrayList<>();
+        activities.stream().filter(a -> a.getTitle().contains(search)).forEach(activity -> {
+            result.add(ActivityDto.builder()
+                .id(activity.getId())
+                .title(activity.getTitle())
+                .price(activity.getPrice())
+                .currency(activity.getCurrency())
+                .rating(activity.getRating())
+                .specialOffer(activity.isSpecialOffer())
+                .supplierName(activity.getSupplier().getName())
+                .build());
+        });
+        return result;
+    }
+}

src/main/resources/db/migration/V1.0.1__create_activities_table.sql

@@ -7,10 +7,10 @@ CREATE TABLE IF NOT EXISTS getyourguide.activity (
     currency VARCHAR(16),
     rating FLOAT,
     special_offer BOOLEAN,
-    supplierId LONG
+    supplier_id LONG
 );
 
-INSERT INTO getyourguide.activity (id, title, price, currency, rating, special_offer, supplierId) VALUES
+INSERT INTO getyourguide.activity (id, title, price, currency, rating, special_offer, supplier_id) VALUES
 (25651, 'German Tour: Parliament Quarter & Reichstag glass dome', 14, '$', 4.8, FALSE, 1),
 (6960, 'Skip the Line: Pergamon Museum Berlin Tickets', 21, '$', 4.8, FALSE, 2),
 (80426, 'Berlin WelcomeCard: Transport, Discounts & Guide Book', 10, '$', 4.6, FALSE, 2),
@@ -19,9 +19,12 @@ INSERT INTO getyourguide.activity (id, title, price, currency, rating, special_o
 (97470, 'Berlin Hop-on Hop-off Bus Tour: 1- or 2-Day Ticket', 210, '$', 4.3, FALSE, 200),
 (15647, 'German Tour: Reichstag with Plenary Chamber & Cuppola', 59, '$', 4.8, FALSE, 250),
 (26823, 'Berlin: 2.5-Hour Boat Tour Along the River Spree', 41, '$', 4.5, TRUE, 1),
+(26824, 'Berlin: 2.5-Hour Boat Tour Along the River Spree', 45, '$', 4.7, TRUE, 1),
+(26825, 'Berlin: 2.5-Hour Boat Tour Along the River Spree', 49, '$', 4.7, TRUE, 1),
 (58351, 'Museum Pass Berlin: 3-Day Entry to Over 40 Top Museums', 14, '$', 4.5, FALSE, 250),
 (75009, 'Reichstag: Rooftop Coffee Break at Käfer', 50, '$', 4.6, TRUE, 2),
 (19340, 'Skip the Line: Neues Museum Berlin Tickets', 46, '$', 4.9, TRUE, 250),
 (13399, 'German Tour: Reichstag with dome Chamber &', 87, '$', 4.8, FALSE, 200),
 (86150, 'Berlin Hop-on Hop-off Bus Tour with Live Commentary', 8, '$', 4.3, FALSE, 1),
-(40881, 'Skip the Line: TV Tower Early Bird Tickets', 140, '$', 4.5, FALSE, 2);
+(40881, 'Skip the Line: TV Tower Early Bird Tickets', 140, '$', 4.5, FALSE, 2),
+(40882, 'City Pass: 3 Days Ticket', 149, '$', 4.2, FALSE, 5);