diff --git a/build.gradle.kts b/build.gradle.kts index 8fda691..165471e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.20" +version = "1.0.21" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/install.sql b/data/db/install.sql index d508aee..1f43623 100644 --- a/data/db/install.sql +++ b/data/db/install.sql @@ -780,26 +780,28 @@ CREATE TABLE IF NOT EXISTS `product` ( `type` enum('subscription','in-app-currency') NOT NULL DEFAULT 'subscription', `valid_from` date DEFAULT NULL, `valid_to` date DEFAULT NULL, - `product_id_ios` char(50) NULL DEFAULT NULL, - `product_id_android` char(50) NULL DEFAULT NULL, + `product_id_ios` CHAR(50) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', + `product_id_android` CHAR(50) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', + `price_ios` FLOAT NULL DEFAULT NULL, + `price_android` FLOAT NULL DEFAULT NULL, PRIMARY KEY (`product_id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4; -- Tábla adatainak mentése aitrainer2.product: ~12 rows (hozzávetőleg) /*!40000 ALTER TABLE `product` DISABLE KEYS */; -REPLACE INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`) VALUES - (1, 'Subscription A', '700 Ft', 'subscription', '2020-11-01', NULL, 'p_ios_1', 'p_android_1'), - (2, 'Subscription B', '1000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (3, 'Subscription C', '1500 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (4, 'Subscription D', '2000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (5, 'Subscription E', '3000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (6, 'Subscription F', '5000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (7, 'Subscription A Yearly', '7000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL), - (8, 'Subscription B Yearly', '10000', 'subscription', '2020-11-04', NULL, NULL, NULL), - (9, 'Subscription C Yearly', '15000', 'subscription', '2020-11-04', NULL, NULL, NULL), - (10, 'Subscription D Yearly', '20000', 'subscription', '2020-11-04', NULL, NULL, NULL), - (11, 'Subscription E Yearly', '30000', 'subscription', '2020-11-04', NULL, NULL, NULL), - (12, 'Subscription F Yearly', '50000', 'subscription', '2020-11-04', NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (1, 'Subscription A', '700 Ft', 'subscription', '2020-11-01', NULL, 'p_ios_1', 'p_android_1', 990, 970); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (2, 'Subscription B', '1000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, 1010, 1005); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (3, 'Subscription C', '1500 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (4, 'Subscription D', '2000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (5, 'Subscription E', '3000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (6, 'Subscription F', '5000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (7, 'Subscription A Yearly', '7000 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (8, 'Subscription B Yearly', '10000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (9, 'Subscription C Yearly', '15000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (10, 'Subscription D Yearly', '20000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (11, 'Subscription E Yearly', '30000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`, `product_id_ios`, `product_id_android`, `price_ios`, `price_android`) VALUES (12, 'Subscription F Yearly', '50000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL); + /*!40000 ALTER TABLE `product` ENABLE KEYS */; -- Struktúra mentése tábla aitrainer2. product_test diff --git a/data/db/update_1_0_21.sql b/data/db/update_1_0_21.sql new file mode 100644 index 0000000..fbc335c --- /dev/null +++ b/data/db/update_1_0_21.sql @@ -0,0 +1,5 @@ +ALTER TABLE `product` + ADD COLUMN `price_ios` FLOAT NULL DEFAULT NULL AFTER `product_id_android`, + ADD COLUMN `price_android` FLOAT NULL DEFAULT NULL AFTER `price_ios`; + +UPDATE configuration set config_value = "1.0.21", date_change=CURRENT_DATE WHERE config_key = "db_version"; \ No newline at end of file diff --git a/logs/aitrainer.2020-11-27.0.log.gz b/logs/aitrainer.2020-11-27.0.log.gz deleted file mode 100644 index afe1f32..0000000 Binary files a/logs/aitrainer.2020-11-27.0.log.gz and /dev/null differ diff --git a/logs/aitrainer.2020-11-28.0.log.gz b/logs/aitrainer.2020-11-28.0.log.gz deleted file mode 100644 index 7b89662..0000000 Binary files a/logs/aitrainer.2020-11-28.0.log.gz and /dev/null differ diff --git a/logs/aitrainer.2020-12-05.0.log.gz b/logs/aitrainer.2020-12-05.0.log.gz deleted file mode 100644 index 3f505ee..0000000 Binary files a/logs/aitrainer.2020-12-05.0.log.gz and /dev/null differ diff --git a/logs/aitrainer.2020-12-06.0.log.gz b/logs/aitrainer.2020-12-06.0.log.gz deleted file mode 100644 index 0a7c66e..0000000 Binary files a/logs/aitrainer.2020-12-06.0.log.gz and /dev/null differ diff --git a/src/main/kotlin/com/aitrainer/api/model/Product.kt b/src/main/kotlin/com/aitrainer/api/model/Product.kt index d3d483f..56e15ec 100644 --- a/src/main/kotlin/com/aitrainer/api/model/Product.kt +++ b/src/main/kotlin/com/aitrainer/api/model/Product.kt @@ -22,5 +22,8 @@ data class Product ( @get: NonNull var validFrom: String? = null, @get: NonNull var validTo: String? = null, @get: NonNull var productIdIos: String? = null, - @get: NonNull var productIdAndroid: String? = null + @get: NonNull var productIdAndroid: String? = null, + @get: NonNull var priceIos: Double? = null, + @get: NonNull var priceAndroid: Double? = null + ) \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 307ddf9..2613c15 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -16,6 +16,6 @@ logging.config=classpath:logback-spring.xml logging.file=logs # if the database structure has been changed, increment this version number -application.version=1.0.20 +application.version=1.0.21 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 01ba2b4..626a83d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,6 +16,6 @@ logging.config=classpath:logback-spring.xml logging.file=logs # if the database structure has been changed, increment this version number -application.version=1.0.20 +application.version=1.0.21 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/test/kotlin/com/aitrainer/api/test/ProductTesting.kt b/src/test/kotlin/com/aitrainer/api/test/ProductTesting.kt index df79558..30bd112 100644 --- a/src/test/kotlin/com/aitrainer/api/test/ProductTesting.kt +++ b/src/test/kotlin/com/aitrainer/api/test/ProductTesting.kt @@ -30,6 +30,8 @@ class ProductTesting { assertEquals(products[0].name, "Subscription A") assertEquals(products[0].productIdIos, "p_ios_1") assertEquals(products[0].productIdAndroid, "p_android_1") + assertEquals(products[0].priceIos, 990.0) + assertEquals(products[0].priceAndroid, 970.0) }