Merge pull request #27 from FIAP-3SOAT-G15/fix-bugs

Fix bugs

docker-compose.yml

@@ -15,7 +15,6 @@ services:
       DB_NAME: orders
       DB_USERNAME: selforder
       DB_PASSWORD: self@Order123!
-      ADMIN_ACCESS_TOKEN: token
       STOCK_SERVICE_URL: http://localhost:8081
       PAYMENTS_SERVICE_URL: http://localhost:8082
     ports:

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.4</version>
+        <version>3.2.8</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.fiap</groupId>
@@ -19,8 +19,9 @@
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
 
         <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
+        <awsspringcloud.version>3.2.0-M1</awsspringcloud.version>
         <testcontainers.version>1.19.1</testcontainers.version>
-        
+
         <skipITs>true</skipITs>
         <skipOpenAPIGen>true</skipOpenAPIGen>
 
@@ -43,16 +44,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/io.awspring.cloud/spring-cloud-aws-starter-sns -->
+        <dependency>
+            <groupId>io.awspring.cloud</groupId>
+            <artifactId>spring-cloud-aws-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.awspring.cloud</groupId>
             <artifactId>spring-cloud-aws-starter-sns</artifactId>
-            <version>3.2.0-M1</version>
         </dependency>
         <dependency>
             <groupId>io.awspring.cloud</groupId>
             <artifactId>spring-cloud-aws-starter-sqs</artifactId>
-            <version>3.2.0-M1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
@@ -102,6 +104,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>localstack</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -149,8 +156,16 @@
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
         </dependency>
     </dependencies>
+
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.awspring.cloud</groupId>
+                <artifactId>spring-cloud-aws-dependencies</artifactId>
+                <version>${awsspringcloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
@@ -160,6 +175,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <build>
         <finalName>orders</finalName>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

src/main/kotlin/com/fiap/order/adapter/messaging/config/MessagingConfig.kt

@@ -13,7 +13,7 @@ class MessagingConfig {
 
     @Bean("PaymentSender")
     fun createPaymentSender(snsTemplate: SnsTemplate,
-                            @Value("\${topic.request-payment}") topicArn: String,
+                            @Value("\${sns.topics.request-payment}") topicArn: String,
                             objectMapper: ObjectMapper) : PaymentSender {
         return PaymentSenderImpl(snsTemplate, topicArn, objectMapper)
     }

src/main/kotlin/com/fiap/order/config/JWTSecurityConfig.kt

@@ -2,6 +2,7 @@ package com.fiap.order.config
 
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType
 import io.swagger.v3.oas.annotations.security.SecurityScheme
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
@@ -19,6 +20,11 @@ import org.springframework.security.web.SecurityFilterChain
     bearerFormat = "JWT",
     scheme = "bearer"
 )
+@ConditionalOnProperty(
+    value = ["security.enable"],
+    havingValue = "true",
+    matchIfMissing = true
+)
 class JWTSecurityConfig {
     @Bean
     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {

src/main/kotlin/com/fiap/order/driver/messaging/consumer/OrderConsumer.kt

@@ -18,7 +18,6 @@ class OrderConsumer(
 
     private val log = LoggerFactory.getLogger(javaClass)
 
-
     @SqsListener("\${sqs.queues.request-payment-response}")
     fun onMessage(message: PaymentEvent, @Headers headers: MessageHeaders) {
         log.info("Event from payment response received $message")

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,10 +1,5 @@
 {
   "properties": [
-    {
-      "name": "admin.access-token",
-      "type": "java.lang.String",
-      "description": "Description for admin-access-token."
-    },
     {
       "name": "payment-provider.mock",
       "type": "java.lang.String",
@@ -34,6 +29,21 @@
       "name": "mercadopago.integration.webhookBaseUrl",
       "type": "java.lang.String",
       "description": "Description for mercadopago.integration.webhookBaseUrl."
+    },
+    {
+      "name": "sqs.queues.request-payment-response",
+      "type": "java.lang.String",
+      "description": "Description for sqs.queues.request-payment-response."
+    },
+    {
+      "name": "sns.topics.request-payment",
+      "type": "java.lang.String",
+      "description": "Description for sns.topics.request-payment."
+    },
+    {
+      "name": "security.enable",
+      "type": "java.lang.String",
+      "description": "Description for security.enable."
     }
   ]
 }

src/main/resources/application-live.yml

@@ -0,0 +1,10 @@
+security:
+  enable: true
+
+spring:
+  security:
+    oauth2:
+      resourceserver:
+        jwt:
+          issuer-uri: ${COGNITO_ISSUER_URI}
+          jwk-set-uri: ${COGNITO_JWK_SET_URI}

src/main/resources/application-local.yml

@@ -0,0 +1,15 @@
+spring:
+  cloud:
+    aws:
+      endpoint: http://localhost:4566
+      credentials:
+        access-key: localstack
+        secret-key: localstack
+      region:
+        static: ${AWS_REGION}
+
+clients:
+  stock-api:
+    url: http://stock.stock
+  payments-api:
+    url: http://payments.payments

src/main/resources/application-test.yml

@@ -1,2 +1,5 @@
-admin:
-  access-token: token
+clients:
+  stock-api:
+    url: http://stock.stock
+  payments-api:
+    url: http://payments.payments

src/main/resources/application.yml

@@ -1,12 +1,4 @@
 spring:
-  cloud:
-    aws:
-      endpoint: http://localhost:4566
-      credentials:
-        access-key: localstack
-        secret-key: localstack
-      region:
-        static: ${AWS_REGION}
   application:
     name: orders-api
   datasource:
@@ -25,26 +17,20 @@ spring:
             non_contextual_creation: true
         ddl-auto: validate
         globally_quoted_identifiers: true
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          issuer-uri: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_ygM5FRn7D
-          jwk-set-uri: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_ygM5FRn7D/.well-known/jwks.json
-
-admin:
-  access-token: ${ADMIN_ACCESS_TOKEN}
 
 clients:
   stock-api:
     url: ${STOCK_SERVICE_URL}
   payments-api:
     url: ${PAYMENTS_SERVICE_URL}
 
-
-topic:
-  request-payment: arn:aws:sns:us-east-2:000000000000:request-payment_topic
-
 sqs:
   queues:
-    request-payment-response: payment-response_queue
+    request-payment-response: payment-response_queue
+
+sns:
+  topics:
+    request-payment: request-payment_topic
+
+security:
+  enable: false

src/test/kotlin/com/fiap/order/TestAnnotations.kt

@@ -1,7 +1,12 @@
 package com.fiap.order
 
+import com.fiap.order.it.LocalStackContainerInitializer
+import com.fiap.order.it.PostgreSQLContainerInitializer
+import com.fiap.order.it.LocalStackTestConfig
 import org.junit.jupiter.api.Tag
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
+import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.cloud.openfeign.FeignAutoConfiguration
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.ContextConfiguration
 
@@ -10,7 +15,17 @@ import org.springframework.test.context.ContextConfiguration
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FILE)
 annotation class IntegrationTest
 
-@ContextConfiguration(initializers = [PostgreSQLContainerInitializer::class])
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ContextConfiguration(
+    initializers = [
+        PostgreSQLContainerInitializer::class,
+        LocalStackContainerInitializer::class
+    ],
+    classes = [
+        LocalStackTestConfig::class,
+        FeignAutoConfiguration::class,
+        ServletWebServerFactoryAutoConfiguration::class,
+    ]
+)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FILE)
-annotation class WithPostgreSQL
+annotation class WithAllDependencies

src/test/kotlin/com/fiap/order/it/BasicIntegrationTest.kt

@@ -0,0 +1,13 @@
+package com.fiap.order.it
+
+import com.fiap.order.IntegrationTest
+import com.fiap.order.WithAllDependencies
+import org.junit.jupiter.api.Test
+
+@IntegrationTest
+@WithAllDependencies
+class BasicIntegrationTest {
+
+    @Test
+    fun contextLoads() { }
+}