From 76ce39f9f617f61be289eb1de3f872e4a2b33cea Mon Sep 17 00:00:00 2001 From: Mathias Quintero Date: Sun, 16 Dec 2018 01:30:17 +0100 Subject: [PATCH 1/6] Allowing testdatainitializer in development too --- src/main/java/backend/configuration/TestDataInitializer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/backend/configuration/TestDataInitializer.kt b/src/main/java/backend/configuration/TestDataInitializer.kt index aff53920..09c733bc 100644 --- a/src/main/java/backend/configuration/TestDataInitializer.kt +++ b/src/main/java/backend/configuration/TestDataInitializer.kt @@ -11,6 +11,7 @@ import backend.model.user.Admin import backend.model.user.Participant import backend.model.user.Sponsor import backend.model.user.UserService +import backend.util.Profiles.DEVELOPMENT import backend.util.Profiles.HEROKU import backend.util.euroOf import org.javamoney.moneta.Money @@ -24,7 +25,7 @@ import java.time.LocalDateTime import javax.annotation.PostConstruct @Service -@Profile(HEROKU) +@Profile(HEROKU, DEVELOPMENT) class TestDataInitializer { // Services From 54c7293c0d787c25b8b4642e90a530782a1606f7 Mon Sep 17 00:00:00 2001 From: Mathias Quintero Date: Sun, 16 Dec 2018 01:30:37 +0100 Subject: [PATCH 2/6] Adding markascurrent and allownewsponsoring to eventservice --- src/main/java/backend/model/event/EventService.kt | 4 ++++ .../java/backend/model/event/EventServiceImpl.kt | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/backend/model/event/EventService.kt b/src/main/java/backend/model/event/EventService.kt index 7359da66..48daa9b9 100644 --- a/src/main/java/backend/model/event/EventService.kt +++ b/src/main/java/backend/model/event/EventService.kt @@ -39,4 +39,8 @@ interface EventService { fun getDonateSum(id: Long): DonateSums fun regenerateCache(eventId: Long?) + + fun markAsCurrent(eventId: Long): Event + + fun allowNewSponsoring(eventId: Long): Event } diff --git a/src/main/java/backend/model/event/EventServiceImpl.kt b/src/main/java/backend/model/event/EventServiceImpl.kt index 24bd4674..b84012c6 100644 --- a/src/main/java/backend/model/event/EventServiceImpl.kt +++ b/src/main/java/backend/model/event/EventServiceImpl.kt @@ -99,4 +99,16 @@ class EventServiceImpl @Autowired constructor(val repository: EventRepository, accSums.fullSum + donateSums.fullSum) }.orElseGet { DonateSums(BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO) } } + + override fun markAsCurrent(id: Long): Event { + val event = this.findById(id) ?: throw NotFoundException("event with id $id does not exist") + event.isCurrent = true + return repository.save(event) + } + + override fun allowNewSponsoring(id: Long): Event { + val event = this.findById(id) ?: throw NotFoundException("event with id $id does not exist") + event.allowNewSponsoring = true + return repository.save(event) + } } From ce4eedb9d89dbbdbe2713c63439de33f4224820b Mon Sep 17 00:00:00 2001 From: Mathias Quintero Date: Sun, 16 Dec 2018 01:31:14 +0100 Subject: [PATCH 3/6] Initializing data with an event that started an hour ago --- .../configuration/TestDataInitializer.kt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/backend/configuration/TestDataInitializer.kt b/src/main/java/backend/configuration/TestDataInitializer.kt index 09c733bc..2fb7a81e 100644 --- a/src/main/java/backend/configuration/TestDataInitializer.kt +++ b/src/main/java/backend/configuration/TestDataInitializer.kt @@ -40,11 +40,23 @@ class TestDataInitializer { @PostConstruct fun initialize() { - val date = LocalDateTime.of(2016, 6, 3, 0, 0) + // Don't perform population if an event exists already + if (eventService.exists(1)) { + return + } + + val date = LocalDateTime.now().minusHours(1) // ---- Events ---- - val eventMunich = eventService.createEvent("Breakout München 2016", date, "München", Coord(48.1374300, 11.5754900), 36) - val eventBerlin = eventService.createEvent("Breakout Berlin 2016", date, "Berlin", Coord(52.5243700, 13.4105300), 36) + val eventMunich = eventService.createEvent("Breakout München", date, "München", Coord(48.1374300, 11.5754900), 36) + val eventBerlin = eventService.createEvent("Breakout Berlin", date, "Berlin", Coord(52.5243700, 13.4105300), 36) + + arrayOf(eventMunich, eventBerlin).forEach { + eventService.markAsCurrent(it.id!!) + eventService.allowNewSponsoring(it.id!!) + } + + // TODO: Insert oauth clients in DB // --- iOS Devs Test Accounts --- val leo = userService.create("leokaessner@me.com", "password", { addRole(Participant::class) }).getRole(Participant::class)!! From 6c01d4d6d989c254a420c948c6b78b09967879a1 Mon Sep 17 00:00:00 2001 From: Mathias Quintero Date: Sun, 31 Mar 2019 14:28:40 +0200 Subject: [PATCH 4/6] Adding mock oauth client details --- .../configuration/TestDataInitializer.kt | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/main/java/backend/configuration/TestDataInitializer.kt b/src/main/java/backend/configuration/TestDataInitializer.kt index 2fb7a81e..bd5fa9e9 100644 --- a/src/main/java/backend/configuration/TestDataInitializer.kt +++ b/src/main/java/backend/configuration/TestDataInitializer.kt @@ -17,6 +17,7 @@ import backend.util.euroOf import org.javamoney.moneta.Money import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Profile +import org.springframework.jdbc.core.JdbcTemplate import org.springframework.security.authentication.UsernamePasswordAuthenticationToken import org.springframework.security.core.context.SecurityContextHolder import org.springframework.security.core.userdetails.UserDetailsService @@ -36,6 +37,7 @@ class TestDataInitializer { @Autowired lateinit private var sponsoringService: SponsoringService @Autowired lateinit private var challengeService: ChallengeService @Autowired lateinit private var userDetailsService: UserDetailsService + @Autowired lateinit private var template: JdbcTemplate @PostConstruct fun initialize() { @@ -115,6 +117,50 @@ class TestDataInitializer { locationService.create(Coord(53.5753200, 10.0153400), participant3, date.plusHours(2)) locationService.create(Coord(52.3740300, 4.8896900), participant3, date.plusHours(2)) + template.execute(""" + INSERT INTO `oauth_client_details` ( + `client_id`, + `resource_ids`, + `client_secret`, + `scope`, + `authorized_grant_types`, + `web_server_redirect_uri`, + `authorities`, + `access_token_validity`, + `refresh_token_validity`, + `additional_information`, + `autoapprove` + ) + + VALUES + ( + 'test_breakout_app', + 'BREAKOUT_BACKEND', + '123456789', + 'read,write', + 'password,refresh_token', + '', + 'USER', + NULL, + NULL, + '{}', + '' + ), + ( + 'test_client_app', + 'BREAKOUT_BACKEND', + '123456789', + 'read,write', + 'password,refresh_token', + '', + 'USER', + NULL, + NULL, + '{}', + '' + ); + """.trimIndent()) + } private fun setAuthenticatedUser(email: String) { From 7809bb61f3a76a46ec66123c64644dd36a3d7b20 Mon Sep 17 00:00:00 2001 From: Mathias Quintero Date: Sun, 31 Mar 2019 14:32:54 +0200 Subject: [PATCH 5/6] Removing TODO --- src/main/java/backend/configuration/TestDataInitializer.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/backend/configuration/TestDataInitializer.kt b/src/main/java/backend/configuration/TestDataInitializer.kt index bd5fa9e9..9958291c 100644 --- a/src/main/java/backend/configuration/TestDataInitializer.kt +++ b/src/main/java/backend/configuration/TestDataInitializer.kt @@ -58,8 +58,6 @@ class TestDataInitializer { eventService.allowNewSponsoring(it.id!!) } - // TODO: Insert oauth clients in DB - // --- iOS Devs Test Accounts --- val leo = userService.create("leokaessner@me.com", "password", { addRole(Participant::class) }).getRole(Participant::class)!! val david = userService.create("david.symhoven@break-out.org", "password", { addRole(Participant::class) }).getRole(Participant::class)!! From 26c5962284643c012d444d5ff2d31a19efd9476c Mon Sep 17 00:00:00 2001 From: dominikglandorf Date: Mon, 15 Apr 2019 17:27:44 +0200 Subject: [PATCH 6/6] fix errors --- .../V201806012220__add_emoji_support_to_posting.sql | 12 ++++++------ .../V201904050000__refactored_teamoverview.sql | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/db/migration/V201806012220__add_emoji_support_to_posting.sql b/src/main/resources/db/migration/V201806012220__add_emoji_support_to_posting.sql index 8fdcbf34..2f18e4f2 100644 --- a/src/main/resources/db/migration/V201806012220__add_emoji_support_to_posting.sql +++ b/src/main/resources/db/migration/V201806012220__add_emoji_support_to_posting.sql @@ -120,12 +120,12 @@ alter table posting_media convert to character set utf8mb4 collate utf8mb4_unico alter table postinglike convert to character set utf8mb4 collate utf8mb4_unicode_ci; -alter table schema_version convert to character set utf8mb4 collate utf8mb4_unicode_ci; -ALTER TABLE `schema_version` CHANGE `version` `version` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL; -ALTER TABLE `schema_version` CHANGE `description` `description` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; -ALTER TABLE `schema_version` CHANGE `type` `type` VARCHAR(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; -ALTER TABLE `schema_version` CHANGE `script` `script` VARCHAR(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; -ALTER TABLE `schema_version` CHANGE `installed_by` `installed_by` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; +-- alter table schema_version convert to character set utf8mb4 collate utf8mb4_unicode_ci; +-- ALTER TABLE `schema_version` CHANGE `version` `version` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL; +-- ALTER TABLE `schema_version` CHANGE `description` `description` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; +-- ALTER TABLE `schema_version` CHANGE `type` `type` VARCHAR(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; +-- ALTER TABLE `schema_version` CHANGE `script` `script` VARCHAR(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; +-- ALTER TABLE `schema_version` CHANGE `installed_by` `installed_by` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''; alter table sponsoring convert to character set utf8mb4 collate utf8mb4_unicode_ci; ALTER TABLE `sponsoring` CHANGE `amount_per_km` `amount_per_km` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL; diff --git a/src/main/resources/db/migration/V201904050000__refactored_teamoverview.sql b/src/main/resources/db/migration/V201904050000__refactored_teamoverview.sql index 3132efab..9e6218df 100644 --- a/src/main/resources/db/migration/V201904050000__refactored_teamoverview.sql +++ b/src/main/resources/db/migration/V201904050000__refactored_teamoverview.sql @@ -13,7 +13,7 @@ CREATE TABLE `contact_with_headquarters` ( `reason` int(11) NOT NULL, `comment` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) -) +); -- Add going to sleep column alter table team add column `asleep` BIT DEFAULT 0; \ No newline at end of file