Release/1.4.0 #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

github-actions wants to merge 145 commits into main from release/1.4.0

.envBackup

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    FRONTEND_DOCKER_TAG=main-2fe8cf0-GHRUN13677293659
+    LOB_NETSUITE_CLIENT_CERTIFICATE_ID=1usWENQUY-8EXklv_iMoqCbUjgNgJkUYMGXJpyQXDUo
+    # SandboxIntegration 7cf3fb8478dfa9563a4546a4d0c68c0f71ddd6763cd47e96e9248eef56cc9ff7
+    #LOB_NETSUITE_CLIENT_CLIENT_ID=abfa657a8c2cc348f6412bc1813fb96cfe0b9512d4ce9b9d68af3edeead9f19a
+    LOB_NETSUITE_CLIENT_CLIENT_ID=a0d5804eea0a5f2c21a9d7d2070437d4bbd1081c60fa596aae00e1671a031c8e
+    LOB_NETSUITE_CLIENT_PRIVATE_KEY_FILE_PATH=/app/private_dev.pem
+    LOCAL_PRIVATE_KEY_PATH=/Users/thkammer/private_dev.pem
+    LOB_NETSUITE_CLIENT_TOKEN_URL=https://6766746-sb1.suitetalk.api.netsuite.com/services/rest/auth/oauth2/v1/token
+    LOB_NETSUITE_CLIENT_URL=https://6766746-sb1.restlets.api.netsuite.com/app/site/hosting/restlet.nl?script=1282&deploy=1&searchname=restsearchtestOld&_is_text=true&recordspercall=1000000000

.envProd

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    FRONTEND_DOCKER_TAG=main-3e9e3fd-GHRUN14493112182
+    LOB_NETSUITE_CLIENT_CERTIFICATE_ID=dfChYbTfry2FQeZS4Ej9gV8VgmjhUY8525w1x2oUyJk
+    LOB_NETSUITE_CLIENT_PRIVATE_KEY_FILE_PATH=/app/private_dev.pem
+    LOCAL_PRIVATE_KEY_PATH=/Users/thkammer/Downloads/credz/private.pem
+    LOB_NETSUITE_CLIENT_RECORDSPERCALL=2500
+    LOB_NETSUITE_CLIENT_URL=https://6766746.restlets.api.netsuite.com/app/site/hosting/restlet.nl?script=1206&deploy=1&searchname=restsearchtestOld&_is_text=true&recordspercall=500;
+    LOB_NETSUITE_CLIENT_TOKEN_URL=https://6766746.suitetalk.api.netsuite.com/services/rest/auth/oauth2/v1/token
+    LOB_NETSUITE_CLIENT_CLIENT_ID=514d71db4c4ae93a709331a0680033ad82dc41dd36c5a36aca87d44a008c28cf
+    LOB_CARDANO_NETWORK=dev

.github/workflows/postman-tests.yml

This file was deleted.

.github/workflows/tests.yml

-Original file line number
+Diff line change
@@ -0,0 +1,110 @@
+    name: e2e Tests
+    on:
+      pull_request:
+    env:
+      REEVE_DB_MIGRATIONS_REPO: cardano-foundation/cf-reeve-db-migrations
+      REEVE_DB_MIGRATIONS_REF: main
+      REEVE_DB_MIGRATIONS_PATH: cf-application/src/main/resources/db/migration/postgresql/cf-reeve-db-migrations
+      GITLAB_MAVEN_REGISTRY_URL: ${{ secrets.GITLAB_MAVEN_REGISTRY_URL }}
+    jobs:
+      postman:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout code
+            uses: actions/checkout@v3
+          - name: Checkout cf-reeve-db-migrations
+            uses: actions/checkout@v4
+            with:
+              repository: ${{ env.REEVE_DB_MIGRATIONS_REPO }}
+              ref: ${{ env.REEVE_DB_MIGRATIONS_REF }}
+              ssh-key: ${{ secrets.CF_REEVE_DB_MIGRATIONS_SSH_DEPLOY_KEY }}
+              path: ${{ env.REEVE_DB_MIGRATIONS_PATH }}
+          - name: Set up Docker Compose
+            run: |
+              docker compose build --build-arg GITLAB_MAVEN_REGISTRY_URL="${GITLAB_MAVEN_REGISTRY_URL}"
+              docker compose up -d
+              timeout 150 docker compose logs -f api || true
+          - name: Services health-check API
+            run: |
+              timeout 180 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9000/swagger-ui/index.html)" != "200" ]]; do sleep 2;echo "."; done'
+              echo "API is up"
+              docker ps
+          - name: Services health-check Keycloak
+            run: |
+              timeout 180 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/master)" != "200" ]]; do sleep 2;echo "."; done'
+              echo "Keycloak is up"
+              docker ps
+          - name: Set up Node.js
+            uses: actions/setup-node@v3
+            with:
+              node-version: 18
+          - name: Install Newman (Postman CLI)
+            run: npm install -g newman
+          - name: Run Postman Collection with Environment
+            run: |
+              newman run postman/Reeve_Integration.postman_collection.json \
+                --environment postman/Reeve_env.postman_environment.json
+      playwright:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout code
+            uses: actions/checkout@v3
+          - name: Checkout cf-reeve-db-migrations
+            uses: actions/checkout@v4
+            with:
+              repository: ${{ env.REEVE_DB_MIGRATIONS_REPO }}
+              ref: ${{ env.REEVE_DB_MIGRATIONS_REF }}
+              ssh-key: ${{ secrets.CF_REEVE_DB_MIGRATIONS_SSH_DEPLOY_KEY }}
+              path: ${{ env.REEVE_DB_MIGRATIONS_PATH }}
+          - name: Set up Docker Compose
+            run: |
+              docker compose build --build-arg GITLAB_MAVEN_REGISTRY_URL="${GITLAB_MAVEN_REGISTRY_URL}"
+              docker compose up -d
+              timeout 150 docker compose logs -f api || true
+          - name: Services health-check API
+            run: |
+              timeout 180 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9000/swagger-ui/index.html)" != "200" ]]; do sleep 2;echo "."; done'
+              echo "API is up"
+              docker ps
+          - name: Services health-check Keycloak
+            run: |
+              timeout 180 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/master)" != "200" ]]; do sleep 2;echo "."; done'
+              echo "Keycloak is up"
+              docker ps
+          - name: Set up Node.js
+            uses: actions/setup-node@v3
+            with:
+              node-version: 24
+          - name: Install Playwright dependencies
+            working-directory: playwright
+            run: |
+              npm ci
+              npx playwright install --with-deps
+          - name: Create .env file
+            working-directory: playwright
+            run: |
+              echo "API_URL=http://localhost:9000/api/v1" >> .env
+              echo "LOGIN_URL=http://localhost:8080" >> .env
+              echo "MANAGER_USER=${{ secrets.PLAYWRIGHT_USER }}" >> .env
+              echo "MANAGER_PASSWORD=${{ secrets.PLAYWRIGHT_PASSWORD }}" >> .env
+              echo "API_LOG_REQUEST=false" >> .env
+              echo "ORGANIZATION_ID=${{ secrets.PLAYWRIGHT_ORGANIZATION_ID }}" >> .env
+              echo "CI=true" >> .env
+          - name: Run Playwright e2e tests
+            working-directory: playwright
+            run: npm run test
+            continue-on-error: true

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ build/ @@
     !gradle/wrapper/gradle-wrapper.jar
     !**/src/main/**/build/
     !**/src/test/**/build/
+    *.pem
     target/
@@ Expand Down @@

Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,5 @@ FROM eclipse-temurin:21-jre AS backend @@
     COPY --from=build /app/cf-application/build/libs/*-all.jar /app.jar
     # Install libsodium system library so lazysodium can load it
     RUN apt-get update && apt-get install -y libsodium23 && rm -rf /var/lib/apt/lists/*
     ENTRYPOINT ["java", "--enable-preview", "-jar", "/app.jar"]

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -51,4 +51,4 @@ export SPRING_PROFILES_ACTIVE=dev--yaci-dev-kit @@
     - Keycloak can be disabled by setting `KEYCLOAK_ENABLED=false` in the `.env` file or in the docker-compose file
     - To test the api swagger set the following two environment variables in the `.env` file or in the docker-compose file:
       - `KEYCLOAK_ENABLED=false`
-      - `KC_BASE_URL=http://localhost:8080`
+      - `KC_BASE_URL=http://localhost:8080`

build.gradle.kts

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,7 @@ subprojects { @@
         apply(plugin = "info.solidsoft.pitest")
         group = "de.cardanofoundation"
-        version = "1.2.0"
+        version = "1.4.0"
         sourceSets {
             named("main") {
@@ Expand All / @@ -31,10 +30,17 @@ subprojects { @@
             mavenLocal()
             mavenCentral()
             maven {
-                url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+                name = "Central Portal Snapshots"
+                url = uri("https://central.sonatype.com/repository/maven-snapshots/")
+                // Only search this repository for the specific dependency
+                content {
+                    includeModule("org.cardanofoundation", "signify")
+                }
             }
-            val gitlabMavenRegistryUrl = providers.environmentVariable("GITLAB_MAVEN_REGISTRY_URL").orElse(providers.gradleProperty("gitlabMavenRegistryUrl"))
+            val gitlabMavenRegistryUrl = providers.environmentVariable("GITLAB_MAVEN_REGISTRY_URL")
+                .orElse(providers.gradleProperty("gitlabMavenRegistryUrl"))
             if (gitlabMavenRegistryUrl.isPresent()) {
                 maven {
                     name = "gitlab"
@@ Expand All / @@ -56,7 +62,7 @@ subprojects { @@
         extra["springBootVersion"] = "3.3.3"
         extra["springCloudVersion"] = "2023.0.0"
         extra["jMoleculesVersion"] = "2023.1.0"
-        extra["cfLobPlatformVersion"] = "1.2.0"
+        extra["cfLobPlatformVersion"] = "1.4.0-PR536-b4adfb0-GHRUN21703459598"
         dependencies {
             compileOnly("org.projectlombok:lombok:1.18.32")
@@ Expand Down @@

cf-application/build.gradle.kts

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ dependencies { @@
         implementation("org.cardanofoundation:cf-lob-platform-csv_erp_adapter:${property("cfLobPlatformVersion")}")
         implementation("org.cardanofoundation:cf-lob-platform-blockchain_publisher:${property("cfLobPlatformVersion")}")
         implementation("org.cardanofoundation:cf-lob-platform-accounting_reporting_core:${property("cfLobPlatformVersion")}")
+        implementation("org.cardanofoundation:cf-lob-platform-reporting:${property("cfLobPlatformVersion")}")
     }
@@ Expand Down @@

cf-application/src/main/java/org/cardanofoundation/lob/app/LobServiceApp.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,17 +1,10 @@
  
    package org.cardanofoundation.lob.app;

    import io.micrometer.core.aop.TimedAspect;

    import io.micrometer.core.instrument.MeterRegistry;

    import lombok.extern.slf4j.Slf4j;

    import java.math.BigDecimal;

    import java.time.Clock;

    import java.time.Duration;

    import lombok.val;

    import org.apache.hc.client5.http.config.RequestConfig;

    import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;

    import org.apache.hc.client5.http.impl.classic.HttpClients;

    import org.apache.hc.core5.util.Timeout;

    import org.cardanofoundation.lob.app.support.javers.LOBBigDecimalComparator;

    import org.cardanofoundation.lob.app.support.spring_web.SpringWebConfig;

    import org.javers.core.Javers;

    import org.javers.core.JaversBuilder;

    import lombok.extern.slf4j.Slf4j;

    import org.springframework.beans.factory.annotation.Value;

    import org.springframework.boot.CommandLineRunner;

    import org.springframework.boot.SpringApplication;

    @@ -36,10 +29,16 @@
  
    import org.springframework.transaction.annotation.EnableTransactionManagement;

    import org.springframework.web.client.RestClient;

    import org.springframework.web.filter.ShallowEtagHeaderFilter;

    import java.math.BigDecimal;

    import java.time.Clock;

    import java.time.Duration;

    import io.micrometer.core.aop.TimedAspect;

    import io.micrometer.core.instrument.MeterRegistry;

    import org.apache.hc.client5.http.config.RequestConfig;

    import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;

    import org.apache.hc.client5.http.impl.classic.HttpClients;

    import org.apache.hc.core5.util.Timeout;

    import org.javers.core.Javers;

    import org.javers.core.JaversBuilder;

    import org.cardanofoundation.lob.app.support.javers.LOBBigDecimalComparator;

    import org.cardanofoundation.lob.app.support.spring_web.SpringWebConfig;

    @SpringBootApplication(exclude = { SecurityAutoConfiguration.class, ErrorMvcAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class })

    @EnableJpaRepositories( { "org.cardanofoundation.lob" } )

...c/main/java/org/cardanofoundation/lob/app/kafka/consumer/AccountingCoreKafkaConsumer.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchFailedEvent;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchStartedEvent;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.ValidateIngestionResponseEvent;
-    import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.ledger.ReportsLedgerUpdatedEvent;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.ledger.TxsLedgerUpdatedEvent;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.reconcilation.ReconcilationChunkEvent;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.reconcilation.ReconcilationFailedEvent;
@@ Expand All / @@ -30,12 +29,6 @@ public void listen(TxsLedgerUpdatedEvent message) { @@
             applicationEventPublisher.publishEvent(message);
         }
-        @KafkaListener(topics = "${lob.accounting_reporting_core.topics.reports-ledger-updated-event}")
-        public void listen(ReportsLedgerUpdatedEvent message) {
-            log.info("Received ReportsLedgerUpdatedEvent from Kafka: {}", message);
-            applicationEventPublisher.publishEvent(message);
-        }
         @KafkaListener(topics = "${lob.accounting_reporting_core.topics.validate-ingestion-response-event}")
         public void listen(ValidateIngestionResponseEvent message) {
             log.info("Received ValidateIngestionResponseEvent from Kafka: {}", message);
@@ Expand Down @@

...n/java/org/cardanofoundation/lob/app/kafka/consumer/BlockchainPublisherKafkaConsumer.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,9 @@ @@
     import lombok.RequiredArgsConstructor;
     import lombok.extern.slf4j.Slf4j;
-    import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.ledger.ReportLedgerUpdateCommand;
     import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.ledger.TransactionLedgerUpdateCommand;
+    import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.ledger.TxRollbackEvent;
+    import org.cardanofoundation.lob.app.reporting.dto.events.PublishReportEvent;
     import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
     import org.springframework.context.ApplicationEventPublisher;
     import org.springframework.kafka.annotation.KafkaListener;
@@ Expand All / @@ -17,15 +18,23 @@ public class BlockchainPublisherKafkaConsumer { @@
         private final ApplicationEventPublisher applicationEventPublisher;
-        @KafkaListener(topics = "${lob.blockchain_publisher.topics.report-ledger-update-command}")
-        public void listen(ReportLedgerUpdateCommand message) {
-            log.info("Received LedgerUpdateCommand from Kafa: {}", message);
-            applicationEventPublisher.publishEvent(message);
-        }
         @KafkaListener(topics = "${lob.blockchain_publisher.topics.transaction-ledger-update-commander}")
         public void listen(TransactionLedgerUpdateCommand message) {
             log.info("Received LedgerUpdateCommand from Kafka: {}", message);
             applicationEventPublisher.publishEvent(message);
         }
+        @KafkaListener(topics = "${lob.reporting.topics.publish-report-event}")
+        public void listen(PublishReportEvent message) {
+            log.info("Received PublishReportEvent from Kafa: {}", message);
+            applicationEventPublisher.publishEvent(message);
+        }
+        @KafkaListener(topics = "${lob.blockchain_publisher.topics.tx-rollback-event}")
+        public void listen(TxRollbackEvent message) {
+            log.info("Received TxRollbackEvent from Kafa: {}", message);
+            applicationEventPublisher.publishEvent(message);
+        }
     }

...on/src/main/java/org/cardanofoundation/lob/app/kafka/consumer/ReportingKafkaConsumer.java

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    package org.cardanofoundation.lob.app.kafka.consumer;
+    import lombok.RequiredArgsConstructor;
+    import lombok.extern.slf4j.Slf4j;
+    import org.cardanofoundation.lob.app.reporting.dto.events.ReportsLedgerUpdatedEvent;
+    import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+    import org.springframework.context.ApplicationEventPublisher;
+    import org.springframework.kafka.annotation.KafkaListener;
+    import org.springframework.stereotype.Service;
+    @Service
+    @Slf4j
+    @RequiredArgsConstructor
+    @ConditionalOnProperty(value = {"lob.reporting.enabled", "spring.kafka.enabled"}, havingValue = "true", matchIfMissing = true)
+    public class ReportingKafkaConsumer {
+        private final ApplicationEventPublisher applicationEventPublisher;
+        @KafkaListener(topics = "${lob.reporting.topics.reports-ledger-updated-event}")
+        public void listen(ReportsLedgerUpdatedEvent message) {
+            log.info("Received ReportsLedgerUpdatedEvent from Kafka: {}", message);
+            applicationEventPublisher.publishEvent(message);
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release/1.4.0 #376

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Release/1.4.0 #376

Are you sure you want to change the base?

Uh oh!

Release/1.4.0 #376

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!