Merge pull request #14 from Jojoooo1/release/4.0

Release - 4.0

Author: Jojoooo1

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,13 +8,14 @@ No task assigned.
 
 # Test
 
-## Unit Tests
+## Unit & Integration Tests
 
 `make test`
 
 # Deploy
 
-After the tests were successful the image will be updated automatically. If you want to update the image for production environment you will need to generate a release and gave the
+After the tests were successful the image will be updated automatically. If you want to update the
+image for production environment you will need to generate a release and gave the
 image name to the SRE team.
 
 

Makefile

@@ -32,11 +32,13 @@ restart-infra: ## Reset and start required infrastructure with docker compose
 	$(MAKE) start-database start-keycloak start-rabbitmq
 
 start-all: ## Run all containers with docker compose
-	$(MAKE) kill start-infra start-api
-
-restart-all: ## Reset and start all containers with docker compose
 	$(MAKE) start-infra start-api
 
+restart-all: ## Restart containers with docker compose
+	@docker compose stop api # used to rebuild API after modification
+	@docker compose up -d
+	@docker compose logs -f api
+
 start-database: ## Run api database
 	@docker compose up -d ${DB_CONTAINER} --wait
 	# Set db_user as superuser to allow replication slot creation within migration
@@ -62,13 +64,9 @@ kill-rabbitmq : ## Kill rabbitmq
 	@docker compose rm -sf rabbitmq
 	@docker volume rm -f api_rabbitmq
 
-restart: ## restart project
-	@docker compose stop api # used to rebuild API after modification
-	@docker compose up -d
-	@docker compose logs -f api
-
 kill: ## Kill and reset project
 	@docker compose down
+	@mvn install -DskipTests
 	$(MAKE) kill-database kill-keycloak kill-rabbitmq
 
 release: ## Create release

docker-compose.yaml

@@ -1,6 +1,7 @@
 version: '3.9'
 
 services:
+  # After using this maven container you need to re-install maven using "mvn install -DskipTests"
   api:
     container_name: api
     image: maven:3.9.4-eclipse-temurin-17
@@ -21,10 +22,11 @@ services:
         condition: service_healthy
     environment:
       MAVEN_CONFIG: /var/maven/.m2
-      SPRING_CLOUD_KUBERNETES_ENABLED: 'false'
-      SPRING_DATASOURCE_URL: 'jdbc:postgresql://api-database/api?stringtype=unspecified&reWriteBatchedInserts=true'
+      SPRING_PROFILES_ACTIVE: dev
+      SPRING_CLOUD_KUBERNETES_ENABLED: "false"
+      SPRING_DATASOURCE_URL: "jdbc:postgresql://localhost:5432/api?stringtype=unspecified&reWriteBatchedInserts=true"
     volumes:
-      - .:/usr/src/workdir:rw
+      - "$PWD:/usr/src/workdir"
       - ~/.m2:/var/maven/.m2
     working_dir: /usr/src/workdir
     healthcheck:

src/main/resources/logback-spring.xml

@@ -35,12 +35,9 @@
           <stackTrace>
             <fieldName>stackTrace</fieldName>
             <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-              <!--  By default set to Integer.MAX_VALUE, full is not working anymore -->
-              <!-- <maxDepthPerThrowable>full</maxDepthPerThrowable>-->
-              <!--  By default set to Integer.MAX_VALUE, full is not working anymore -->
-              <!-- <maxLength>full</maxLength>-->
-              <!--  By default set to -1, full is not working anymore -->
-              <!-- <shortenedClassNameLength>20</shortenedClassNameLength>-->
+              <maxDepthPerThrowable>4</maxDepthPerThrowable>
+              <!-- <maxLength>256</maxLength>-->
+              <shortenedClassNameLength>30</shortenedClassNameLength>
               <rootCauseFirst>true</rootCauseFirst>
             </throwableConverter>
           </stackTrace>