Merge pull request #6 from OpenFuturePlatform/develop

Merge develop

Author: borbuevbeksultan

build.gradle

@@ -24,6 +24,7 @@ repositories {
     maven {
         url "https://maven.dcm4che.org"
     }
+    jcenter()
 }
 
 dependencies {
@@ -72,15 +73,15 @@ dependencies {
     // WebJars Locator
     implementation 'org.webjars:webjars-locator:0.46'
 
-    // 
+    //
     implementation ("org.webjars.bower:bootstrap:5.2.2")
     implementation ("org.webjars.bower:demo-console:1.5.1")
     implementation ("org.webjars.bower:draggabilly:2.1.0")
     implementation ("org.webjars.bower:ekko-lightbox:5.2.0")
     implementation ("org.webjars.bower:jquery:3.6.1")
     implementation ("org.webjars.bower:jsnlog.js:2.20.1")
     implementation ("org.webjars.bower:webrtc-adapter:7.4.0")
-    
+
     implementation("org.kurento:kurento-commons:7.1.0")
     implementation("org.kurento:kurento-client:7.1.0")
     implementation("org.kurento:kurento-utils-js:7.1.0")
@@ -93,6 +94,9 @@ dependencies {
 
     testImplementation 'org.testcontainers:postgresql:1.19.7'
 
+    implementation("org.springframework.boot:spring-boot-starter-webflux")
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+
 }
 
 tasks.named('test') {

src/main/kotlin/io/openfuture/openmessenger/assistant/model/Reminder.kt

@@ -16,6 +16,8 @@ data class Reminder(
 ): BaseModel
 
 data class ReminderItem(
-    val remindAt: LocalDateTime?,
+    val remindAt: String?,
     val description: String?
-)
+){
+
+}

src/main/kotlin/io/openfuture/openmessenger/assistant/model/Todos.kt

@@ -18,6 +18,6 @@ data class Todos(
 data class Todo(
     val executor: String?,
     val description: String?,
-    val dueDate: LocalDateTime?,
+    val dueDate: String?,
     val context: String?
 )

src/main/kotlin/io/openfuture/openmessenger/component/state/DefaultStateApi.kt

@@ -0,0 +1,40 @@
+package io.openfuture.openmessenger.component.state
+
+import io.openfuture.openmessenger.repository.entity.BlockchainType
+import io.openfuture.openmessenger.service.dto.StateWalletDto
+import org.springframework.http.MediaType
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.BodyInserters
+import org.springframework.web.reactive.function.client.WebClient
+
+
+@Component
+class DefaultStateApi(
+    private val stateWebClient: WebClient
+) : StateApi {
+
+    override fun createWallet(
+        address: String,
+        webHook: String,
+        blockchain: BlockchainType,
+        applicationId: String
+    ): StateWalletDto? {
+        val request = CreateStateWalletRequest(address, applicationId, blockchain.getValue(), webHook)
+        println("State save request $request")
+        return stateWebClient
+            .post()
+            .uri("http://localhost:8545/api/wallets/single")
+            .accept(MediaType.APPLICATION_JSON)
+            .body(BodyInserters.fromValue(request))
+            .retrieve()
+            .bodyToMono(StateWalletDto::class.java)
+            .block()
+    }
+
+    data class CreateStateWalletRequest(
+        val address: String,
+        val applicationId: String,
+        val blockchain: String,
+        val webhook: String
+    )
+}

src/main/kotlin/io/openfuture/openmessenger/component/state/StateApi.kt

@@ -0,0 +1,8 @@
+package io.openfuture.openmessenger.component.state
+
+import io.openfuture.openmessenger.repository.entity.BlockchainType
+import io.openfuture.openmessenger.service.dto.StateWalletDto
+
+interface StateApi {
+    fun createWallet(address: String, webHook: String, blockchain: BlockchainType, applicationId: String): StateWalletDto?
+}

src/main/kotlin/io/openfuture/openmessenger/configuration/SecurityConfig.kt

@@ -2,7 +2,6 @@ package io.openfuture.openmessenger.configuration
 
 import io.openfuture.openmessenger.security.AwsCognitoTokenFilter
 import io.openfuture.openmessenger.security.CognitoAuthenticationProvider
-import jakarta.servlet.http.HttpServletRequest
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.Customizer
@@ -14,9 +13,6 @@ import org.springframework.security.config.annotation.web.configurers.SessionMan
 import org.springframework.security.config.http.SessionCreationPolicy
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.web.cors.CorsConfiguration
-import org.springframework.web.cors.CorsConfigurationSource
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 
 @Configuration
 @EnableWebSecurity
@@ -36,6 +32,8 @@ class SecurityConfig(
             .authorizeHttpRequests {
                 it.requestMatchers("/api/v1/public/login").permitAll()
                 it.requestMatchers("/api/v1/public/signup").permitAll()
+                it.requestMatchers("/api/v1/refreshToken").permitAll()
+                it.requestMatchers("/api/v1/wallets/webhook").permitAll()
                 it.requestMatchers("/api/v1/attachments/download/**").permitAll()
                 it.requestMatchers("/*").permitAll()
                 it.requestMatchers("/webjars/**").permitAll()
@@ -52,7 +50,9 @@ class SecurityConfig(
                     "/api/v1/public/login",
                     "/api/v1/public/signup",
                     "/api/v1/attachments/download/**",
-                    listOf("/*", "/webjars/**", "/js/*", "/img/*", "/css/*", "/video/*")
+                    listOf("/*", "/webjars/**", "/js/*", "/img/*", "/css/*", "/video/*"),
+                    "/api/v1/refreshToken",
+                    "/api/v1/wallets/webhook"
                 ),
                 UsernamePasswordAuthenticationFilter::class.java
             )

src/main/kotlin/io/openfuture/openmessenger/configuration/StateConfig.kt

@@ -0,0 +1,18 @@
+package io.openfuture.openmessenger.configuration
+
+import io.openfuture.openmessenger.configuration.property.StateProperties
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.reactive.function.client.WebClient
+
+
+@Configuration
+class StateConfig {
+
+    @Bean
+    fun stateClient(stateProperties: StateProperties): WebClient =
+        WebClient.builder()
+            .baseUrl(stateProperties.baseUrl!!)
+            .build()
+
+}

src/main/kotlin/io/openfuture/openmessenger/configuration/property/StateProperties.kt

@@ -0,0 +1,12 @@
+package io.openfuture.openmessenger.configuration.property
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+import org.springframework.validation.annotation.Validated
+import javax.validation.constraints.NotBlank
+import javax.validation.constraints.NotNull
+
+@ConfigurationProperties(prefix = "state")
+@Validated
+@Component
+data class StateProperties(@field:NotNull @field:NotBlank var baseUrl: String?)

src/main/kotlin/io/openfuture/openmessenger/repository/BlockchainContractRepository.kt

@@ -0,0 +1,15 @@
+package io.openfuture.openmessenger.repository
+
+import io.openfuture.openmessenger.repository.entity.BlockchainContractEntity
+import io.openfuture.openmessenger.repository.entity.BlockchainType
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+
+interface BlockchainContractRepository : JpaRepository<BlockchainContractEntity, Long> {
+    @Query("SELECT t from BlockchainContractEntity t where t.blockchain = :blockchain and t.isTest = :isTest")
+    fun findFirstByBlockchain(blockchain: BlockchainType, isTest: Boolean) : BlockchainContractEntity?
+
+    @Query("SELECT t from BlockchainContractEntity t where t.isTest = :isTest")
+    fun findAllByIsTest(isTest: Boolean) : List<BlockchainContractEntity>
+
+}

src/main/kotlin/io/openfuture/openmessenger/repository/TaskRepository.kt

@@ -0,0 +1,11 @@
+package io.openfuture.openmessenger.repository
+
+import io.openfuture.openmessenger.repository.entity.TaskEntity
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+
+interface TaskRepository : JpaRepository<TaskEntity, Long> {
+    @Query("SELECT t from TaskEntity t where t.assignee = :emailAddress or t.assignor =:emailAddress ")
+    fun findAllByAssigneeOrAssignor(emailAddress: String) : List<TaskEntity>
+
+}