api: update

Author: cevatarmutlu

api/Dockerfile

@@ -6,4 +6,4 @@ RUN sh -c 'touch /api.jar'
 
 EXPOSE 8080
 
-ENTRYPOINT [ "sh", "-c","java -XX:+UseStringDeduplication -jar /api.jar" ]
+ENTRYPOINT [ "sh", "-c","java -XX:+UseStringDeduplication -jar /api.jar --spring.datasource.url=jdbc:postgresql://postgres:5432/data-db" ]

api/src/main/java/com/hepsiburada/api/repository/BrowsingHistoryRepository.java

@@ -16,7 +16,7 @@ public interface BrowsingHistoryRepository extends CrudRepository<BrowsingHistor
  @Query(
  value = "SELECT product_id FROM browsing_history\n" +
  "WHERE user_id = :userId\n" +
- "ORDER BY timestamp DESC" +
+ "ORDER BY timestamp DESC\n" +
  "LIMIT 10",
  nativeQuery = true
  )

api/src/test/java/com/hepsiburada/api/controller/BrowsingHistoryControllerTest.java

@@ -33,14 +33,19 @@ public class BrowsingHistoryControllerTest {
  @Test
  public void givenProductList_whenTenViewedProduct_thenReturnJsonArray() throws Exception {
 
+ LinkedHashMap<String, Object> result = new LinkedHashMap<>();
+ result.put("user-id", 111);
  List<Integer> products = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ result.put("products", products);
+ result.put("type", "personalized");
 
- Mockito.doReturn(products)
+
+ Mockito.doReturn(result)
  .when(historyService).getViewedProduct(111);
 
- mvc.perform(get("/api/history/tenproduct")
+ mvc.perform(get("/api/history/products")
  .contentType(MediaType.APPLICATION_JSON)
- .param("userid", String.valueOf(111)))
+ .param("userId", String.valueOf(111)))
  .andExpect(status().isOk())
  .andExpect(jsonPath("$", isA(LinkedHashMap.class)))
  .andExpect(jsonPath("$.type", is("personalized")))