From 26e585047120444a32cd112f5c306db35953838f Mon Sep 17 00:00:00 2001 From: Hung Tran Date: Mon, 3 May 2021 10:35:42 -0700 Subject: [PATCH 1/6] Upgrade TestContainer --- webapi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapi/pom.xml b/webapi/pom.xml index 7fa13e0..319e90b 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -74,7 +74,7 @@ org.testcontainers mysql - 1.14.3 + 1.15.3 test From f41e543191b1616f155df2924450016040541ca4 Mon Sep 17 00:00:00 2001 From: Hung Tran Date: Mon, 3 May 2021 10:35:52 -0700 Subject: [PATCH 2/6] Use Java 15 --- webapi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapi/pom.xml b/webapi/pom.xml index 319e90b..3ed48d1 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -15,7 +15,7 @@ One stop solution to keep track of your meals - 11 + 15 1.4.13 From 6db9198c0d6ed078f64f713b61a7b3b4219662fd Mon Sep 17 00:00:00 2001 From: Hung Tran Date: Tue, 4 May 2021 00:49:58 -0700 Subject: [PATCH 3/6] Upgrade Spring Boot 2.4.5 --- webapi/Dockerfile | 2 +- webapi/pom.xml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 6972a5d..426b5bc 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11.0.3-jre-stretch +FROM amazoncorretto:16.0.1-alpine MAINTAINER Hung Tran VOLUME /tmp ARG JAR_FILE diff --git a/webapi/pom.xml b/webapi/pom.xml index 3ed48d1..e67cc02 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.5 com.mealtracker @@ -71,6 +71,18 @@ test + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + + org.testcontainers mysql From e2dc469d2f892c638b9aa44358a39043f9e66040 Mon Sep 17 00:00:00 2001 From: Hung Tran Date: Tue, 4 May 2021 01:20:31 -0700 Subject: [PATCH 4/6] Enable Spring @SQL logging --- .../integration-test/resources/application-test.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/webapi/src/integration-test/resources/application-test.yml b/webapi/src/integration-test/resources/application-test.yml index b587521..f0fe7ef 100644 --- a/webapi/src/integration-test/resources/application-test.yml +++ b/webapi/src/integration-test/resources/application-test.yml @@ -3,3 +3,13 @@ spring: url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} + +logging: + level: + org: + springframework: + test: + context: + jdbc: + SqlScriptsTestExecutionListener: + DEBUG \ No newline at end of file From df511f58538d158e2a5eff320a3da4e72611c0b8 Mon Sep 17 00:00:00 2001 From: Hung Tran Date: Tue, 4 May 2021 02:13:32 -0700 Subject: [PATCH 5/6] Fix a bug which affects LocalDate/LocalTime related queries --- .../integration-test/resources/application-test.yml | 11 ++++------- .../main/java/com/mealtracker/config/JpaConfig.java | 3 ++- .../src/main/java/com/mealtracker/domains/Meal.java | 4 ++-- .../com/mealtracker/repositories/MealRepository.java | 3 +-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/webapi/src/integration-test/resources/application-test.yml b/webapi/src/integration-test/resources/application-test.yml index f0fe7ef..1169a75 100644 --- a/webapi/src/integration-test/resources/application-test.yml +++ b/webapi/src/integration-test/resources/application-test.yml @@ -6,10 +6,7 @@ spring: logging: level: - org: - springframework: - test: - context: - jdbc: - SqlScriptsTestExecutionListener: - DEBUG \ No newline at end of file + org.hibernate.SQL: OFF + org.hibernate.type: OFF + org.springframework: + test.context.jdbc.SqlScriptsTestExecutionListener: DEBUG \ No newline at end of file diff --git a/webapi/src/main/java/com/mealtracker/config/JpaConfig.java b/webapi/src/main/java/com/mealtracker/config/JpaConfig.java index aab910e..dcbbefb 100644 --- a/webapi/src/main/java/com/mealtracker/config/JpaConfig.java +++ b/webapi/src/main/java/com/mealtracker/config/JpaConfig.java @@ -3,12 +3,13 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @EnableAutoConfiguration -@EntityScan(basePackages = {"com.mealtracker.domains"}) +@EntityScan(basePackages = {"com.mealtracker.domains"}, basePackageClasses = { Jsr310JpaConverters.class }) @EnableJpaRepositories(basePackages = {"com.mealtracker.repositories"}) @EnableTransactionManagement public class JpaConfig { diff --git a/webapi/src/main/java/com/mealtracker/domains/Meal.java b/webapi/src/main/java/com/mealtracker/domains/Meal.java index 7f3f13e..654d2e0 100644 --- a/webapi/src/main/java/com/mealtracker/domains/Meal.java +++ b/webapi/src/main/java/com/mealtracker/domains/Meal.java @@ -30,10 +30,10 @@ public class Meal implements Ownable { @Column(name = "name") private String name; - @Column(name = "consumed_date", nullable = false) + @Column(name = "consumed_date", nullable = false, columnDefinition = "DATE") private LocalDate consumedDate; - @Column(name = "consumed_time", nullable = false) + @Column(name = "consumed_time", nullable = false, columnDefinition = "TIME") private LocalTime consumedTime; @Column(name = "calories", nullable = false) diff --git a/webapi/src/main/java/com/mealtracker/repositories/MealRepository.java b/webapi/src/main/java/com/mealtracker/repositories/MealRepository.java index a93744c..3026065 100644 --- a/webapi/src/main/java/com/mealtracker/repositories/MealRepository.java +++ b/webapi/src/main/java/com/mealtracker/repositories/MealRepository.java @@ -25,7 +25,7 @@ public interface MealRepository extends PagingAndSortingRepository { List findMealByConsumedDateAndConsumerAndDeleted(LocalDate date, User consumer, boolean deleted); - @Query("SELECT meal FROM Meal meal WHERE meal.consumer.id = :consumerId AND deleted = false " + + @Query("SELECT meal FROM Meal meal WHERE meal.consumer.id = :consumerId AND meal.deleted = false " + "AND (:fromDate IS NULL OR :fromDate <= meal.consumedDate) " + "AND (:toDate IS NULL OR :toDate > meal.consumedDate) " + "AND (:fromTime IS NULL OR :fromTime <= meal.consumedTime) " + @@ -37,7 +37,6 @@ Page filterMyMeals(@Param("consumerId") long consumerId, @Param("toTime") LocalTime toTime, Pageable pageable); - @EntityGraph(value = "Meal.consumer", type = EntityGraph.EntityGraphType.LOAD) @Query("SELECT meal FROM Meal meal JOIN meal.consumer consumer " + "WHERE meal.deleted = false AND consumer.deleted = false AND meal.id = :mealId " + From ae091aeb1e3e7e353dc96baa160897c27cef7b13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Nov 2025 13:03:04 +0000 Subject: [PATCH 6/6] Bump js-yaml from 3.13.1 to 3.14.2 in /webclient Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.13.1 to 3.14.2. - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.13.1...3.14.2) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 3.14.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- webclient/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webclient/yarn.lock b/webclient/yarn.lock index 32bfca4..68a314b 100644 --- a/webclient/yarn.lock +++ b/webclient/yarn.lock @@ -7299,9 +7299,9 @@ js-tokens@^3.0.2: integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0: - version "3.13.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + version "3.14.2" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0" + integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg== dependencies: argparse "^1.0.7" esprima "^4.0.0"