bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API1.0.21 Product, price_ios, price_android

Browse Source
This commit is contained in:
Bossanyi Tibor 2020-12-23 21:07:46 +01:00
parent df19de5103
commit d1cd8c1ffa
11 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -11,7 +11,7 @@ plugins {
} }
group = "com.aitrainer" group = "com.aitrainer"
version = "1.0.20" version = "1.0.21"
java.sourceCompatibility = JavaVersion.VERSION_1_8 java.sourceCompatibility = JavaVersion.VERSION_1_8
repositories { repositories {

32
data/db/install.sql
View File

@ -780,26 +780,28 @@ CREATE TABLE IF NOT EXISTS `product` (
`type` enum('subscription','in-app-currency') NOT NULL DEFAULT 'subscription', `type` enum('subscription','in-app-currency') NOT NULL DEFAULT 'subscription',
`valid_from` date DEFAULT NULL, `valid_from` date DEFAULT NULL,
`valid_to` date DEFAULT NULL, `valid_to` date DEFAULT NULL,
`product_id_ios` 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, `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 PRIMARY KEY (`product_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4;
-- Tábla adatainak mentése aitrainer2.product: ~12 rows (hozzávetőleg) -- Tábla adatainak mentése aitrainer2.product: ~12 rows (hozzávetőleg)
/*!40000 ALTER TABLE `product` DISABLE KEYS */; /*!40000 ALTER TABLE `product` DISABLE KEYS */;
REPLACE INTO `product` (`product_id`, `name`, `description`, `type`, `valid_from`, `valid_to`) VALUES 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);
(1, 'Subscription A', '700 Ft', 'subscription', '2020-11-01', NULL, 'p_ios_1', 'p_android_1'), 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);
(2, 'Subscription B', '1000 Ft', 'subscription', '2020-11-01', 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 (3, 'Subscription C', '1500 Ft', 'subscription', '2020-11-01', NULL, NULL, NULL, NULL, NULL);
(3, 'Subscription C', '1500 Ft', 'subscription', '2020-11-01', 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);
(4, 'Subscription D', '2000 Ft', 'subscription', '2020-11-01', 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);
(5, 'Subscription E', '3000 Ft', 'subscription', '2020-11-01', 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);
(6, 'Subscription F', '5000 Ft', 'subscription', '2020-11-01', 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);
(7, 'Subscription A Yearly', '7000 Ft', 'subscription', '2020-11-01', 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);
(8, 'Subscription B Yearly', '10000', '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 (9, 'Subscription C Yearly', '15000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL);
(9, 'Subscription C Yearly', '15000', '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 (10, 'Subscription D Yearly', '20000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL);
(10, 'Subscription D Yearly', '20000', '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 (11, 'Subscription E Yearly', '30000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL);
(11, 'Subscription E Yearly', '30000', '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 (12, 'Subscription F Yearly', '50000', 'subscription', '2020-11-04', NULL, NULL, NULL, NULL, NULL);
(12, 'Subscription F Yearly', '50000', 'subscription', '2020-11-04', NULL, NULL, NULL);
/*!40000 ALTER TABLE `product` ENABLE KEYS */; /*!40000 ALTER TABLE `product` ENABLE KEYS */;
-- Struktúra mentése tábla aitrainer2. product_test -- Struktúra mentése tábla aitrainer2. product_test

5
data/db/update_1_0_21.sql Normal file
View File

@ -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";

BIN
logs/aitrainer.2020-11-27.0.log.gz
View File

Binary file not shown.

BIN
logs/aitrainer.2020-11-28.0.log.gz
View File

Binary file not shown.

BIN
logs/aitrainer.2020-12-05.0.log.gz
View File

Binary file not shown.

BIN
logs/aitrainer.2020-12-06.0.log.gz
View File

Binary file not shown.

5
src/main/kotlin/com/aitrainer/api/model/Product.kt
View File

@ -22,5 +22,8 @@ data class Product (
@get: NonNull var validFrom: String? = null, @get: NonNull var validFrom: String? = null,
@get: NonNull var validTo: String? = null, @get: NonNull var validTo: String? = null,
@get: NonNull var productIdIos: 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
) )

2
src/main/resources/application-prod.properties
View File

@ -16,6 +16,6 @@ logging.config=classpath:logback-spring.xml
logging.file=logs logging.file=logs
# if the database structure has been changed, increment this version number # if the database structure has been changed, increment this version number
application.version=1.0.20 application.version=1.0.21
jwt.secret=aitrainer jwt.secret=aitrainer

2
src/main/resources/application.properties
View File

@ -16,6 +16,6 @@ logging.config=classpath:logback-spring.xml
logging.file=logs logging.file=logs
# if the database structure has been changed, increment this version number # if the database structure has been changed, increment this version number
application.version=1.0.20 application.version=1.0.21
jwt.secret=aitrainer jwt.secret=aitrainer

2
src/test/kotlin/com/aitrainer/api/test/ProductTesting.kt
View File

@ -30,6 +30,8 @@ class ProductTesting {
assertEquals(products[0].name, "Subscription A") assertEquals(products[0].name, "Subscription A")
assertEquals(products[0].productIdIos, "p_ios_1") assertEquals(products[0].productIdIos, "p_ios_1")
assertEquals(products[0].productIdAndroid, "p_android_1") assertEquals(products[0].productIdAndroid, "p_android_1")
assertEquals(products[0].priceIos, 990.0)
assertEquals(products[0].priceAndroid, 970.0)
} }