Merge branch 'main' into experimental-raid-stats-no-authentication

# Conflicts: # src/test/java/com/danielvm/destiny2bot/factory/ApplicationCommandFactoryTest.java # src/test/java/com/danielvm/destiny2bot/integration/BaseIntegrationTest.java
dvillavicencio · Feb 16, 2024 · 0efe917 · 0efe917
2 parents cf9438a + 5952b9e
commit 0efe917
Show file tree

Hide file tree

Showing 36 changed files with 33 additions and 763 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'org.springframework.boot' version '3.2.0'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
-    id 'org.flywaydb.flyway' version '10.0.0'
 }
 
 group = 'com.danielvm'
@@ -57,35 +56,26 @@ jar {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
-    implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
     implementation 'org.springframework.session:spring-session-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-devtools'
     implementation "net.i2p.crypto:eddsa:${i2pCryptoVersion}"
     implementation "commons-io:commons-io:${IOCommonsVersion}"
     implementation "org.projectlombok:lombok:${lombokVersion}"
     implementation "org.aspectj:aspectjrt:${aspectJRTVersion}"
-    implementation "org.flywaydb:flyway-core:${flywayCoreVersion}"
-    implementation "org.postgresql:postgresql:${postgresqlVersion}"
-    implementation "org.postgresql:r2dbc-postgresql:${postgresR2dbcVersion}"
     implementation "org.aspectj:aspectjweaver:${aspectJWeaverVersion}"
     implementation "commons-codec:commons-codec:${commonsCodecVersion}"
     implementation "software.pando.crypto:salty-coffee:${pandoCryptoVersion}"
     implementation "org.apache.commons:commons-collections4:${apacheCollectionsVersion}"
-    implementation "org.flywaydb:flyway-database-postgresql:${flywayPostgresVersion}"
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.cloud:spring-cloud-starter-contract-stub-runner'
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation "org.testcontainers:jdbc:${tcJdbcVersion}"
-    testImplementation "org.testcontainers:r2dbc:${tcR2dbcVersion}"
-    testImplementation "org.testcontainers:postgresql:${tcPostgresVersion}"
     testImplementation "org.testcontainers:junit-jupiter:${tcJunitVersion}"
     testImplementation "io.projectreactor:reactor-test:${reactorTestVersion}"
     testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterParamsVersion}"
-    testImplementation "org.flywaydb.flyway-test-extensions:flyway-spring-test:${flywayTestVersion}"
 }
 
 dependencyManagement {

diff --git a/src/main/java/com/danielvm/destiny2bot/config/FlywayConfiguration.java b/src/main/java/com/danielvm/destiny2bot/config/FlywayConfiguration.java
diff --git a/src/main/java/com/danielvm/destiny2bot/entity/BotUser.java b/src/main/java/com/danielvm/destiny2bot/entity/BotUser.java
diff --git a/src/main/java/com/danielvm/destiny2bot/entity/CharacterRaid.java b/src/main/java/com/danielvm/destiny2bot/entity/CharacterRaid.java
diff --git a/src/main/java/com/danielvm/destiny2bot/entity/RaidParticipant.java b/src/main/java/com/danielvm/destiny2bot/entity/RaidParticipant.java
diff --git a/src/main/java/com/danielvm/destiny2bot/entity/UserCharacter.java b/src/main/java/com/danielvm/destiny2bot/entity/UserCharacter.java
diff --git a/src/main/java/com/danielvm/destiny2bot/entity/UserPageInformation.java b/src/main/java/com/danielvm/destiny2bot/entity/UserPageInformation.java
diff --git a/src/main/java/com/danielvm/destiny2bot/enums/RaidEncounter.java b/src/main/java/com/danielvm/destiny2bot/enums/RaidEncounter.java
@@ -1,10 +1,11 @@
 package com.danielvm.destiny2bot.enums;
 
+import lombok.Getter;
+import reactor.core.publisher.Flux;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import lombok.Getter;
-import reactor.core.publisher.Flux;
 
 public enum RaidEncounter {
 
@@ -62,7 +63,7 @@ public enum RaidEncounter {
   DAUGHTERS(Raid.KINGS_FALL, "Daughter's of Oryx", "daughters"),
   ORYX(Raid.KINGS_FALL, "Oryx, the Taken King", "oryx"),
 
-  // Crota's End
+  // Crota's
   STILLS(Raid.CROTAS_END, "The Stills", "stills"),
   BRIDGE(Raid.CROTAS_END, "The Bridge", "bridge"),
   IR_YUT(Raid.CROTAS_END, "Ir Yut, the Deathsinger", "ir_yut"),

diff --git a/src/main/java/com/danielvm/destiny2bot/filter/RequestBodyCacheFilter.java b/src/main/java/com/danielvm/destiny2bot/filter/RequestBodyCacheFilter.java
diff --git a/src/main/java/com/danielvm/destiny2bot/mapper/BotUserMapper.java b/src/main/java/com/danielvm/destiny2bot/mapper/BotUserMapper.java
diff --git a/src/main/java/com/danielvm/destiny2bot/mapper/UserCharacterMapper.java b/src/main/java/com/danielvm/destiny2bot/mapper/UserCharacterMapper.java
diff --git a/src/main/java/com/danielvm/destiny2bot/repository/BotUserRepository.java b/src/main/java/com/danielvm/destiny2bot/repository/BotUserRepository.java
diff --git a/src/main/java/com/danielvm/destiny2bot/repository/BotUserRepositoryImpl.java b/src/main/java/com/danielvm/destiny2bot/repository/BotUserRepositoryImpl.java
diff --git a/src/main/java/com/danielvm/destiny2bot/repository/UserCharacterRepository.java b/src/main/java/com/danielvm/destiny2bot/repository/UserCharacterRepository.java