Merge pull request #6 from dynamiatools/3.x

v3.1.2
dynamiatools · Jun 11, 2024 · ec9d3af · ec9d3af
2 parents ae86484 + 6e2316d
commit ec9d3af
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,35 @@
+# Version 5.0.0
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Release and Deploy
+
+on:
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        architecture: x64
+        distribution: corretto
+        cache: maven
+        server-id: ossrh
+        server-username: MAVEN_USERNAME # env variable for username in deploy
+        server-password: MAVEN_PASSWORD # env variable for token in deploy
+        gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+
+    - name: Build with Maven
+      run: mvn clean javadoc:jar source:jar deploy -P release-sign-artifacts
+      env:
+        GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/sources/api/pom.xml b/sources/api/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>tools.dynamia.modules</groupId>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <artifactId>tools.dynamia.modules.saas.api</artifactId>
 
     <name>DynamiaModules - SaaS API</name>
     <url>https://www.dynamia.tools/modules/saas</url>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
 
     <build>
         <plugins>

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountDTO.java
@@ -18,7 +18,7 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import tools.dynamia.modules.saas.api.enums.AccountStatus;
 
 import java.io.Serializable;
@@ -29,6 +29,7 @@
  * @author Mario Serrano Leones
  */
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountDTO implements Serializable {
 
 
@@ -91,6 +92,7 @@ public class AccountDTO implements Serializable {
     private int freeTrial;
     private int freeTrialLeft;
     private boolean inFreeTrial;
+    private String redirect;
 
     private String defaultPassword;
 
@@ -633,4 +635,11 @@ private boolean isFreeTrial() {
         return freeTrial > 0;
     }
 
+    public String getRedirect() {
+        return redirect;
+    }
+
+    public void setRedirect(String redirect) {
+        this.redirect = redirect;
+    }
 }
diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountFeatureDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountFeatureDTO.java
@@ -17,8 +17,11 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountFeatureDTO implements Serializable {
 
     private Long id;

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountLogDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountLogDTO.java
@@ -17,9 +17,12 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountLogDTO implements Serializable {
 
     private Date date = new Date();

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountPaymentDTO.java
@@ -17,9 +17,12 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountPaymentDTO implements Serializable {
 
     private Long id;

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountStatusDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountStatusDTO.java
@@ -17,12 +17,14 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import tools.dynamia.modules.saas.api.enums.AccountStatus;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountStatusDTO implements Serializable {
 
 

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountTypeDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountTypeDTO.java
@@ -18,6 +18,7 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import tools.dynamia.modules.saas.api.enums.AccountPeriodicity;
 
 import java.io.Serializable;
@@ -29,6 +30,7 @@
  * @author Mario Serrano Leones
  */
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountTypeDTO implements Serializable {
 
     private Long id;

diff --git a/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountTypeRestrictionDTO.java b/sources/api/src/main/java/tools/dynamia/modules/saas/api/dto/AccountTypeRestrictionDTO.java
@@ -18,12 +18,15 @@
 
 package tools.dynamia.modules.saas.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 
 /**
  * @author Mario Serrano Leones
  */
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountTypeRestrictionDTO implements Serializable {
 
     private Long id;

diff --git a/sources/core/pom.xml b/sources/core/pom.xml
@@ -22,10 +22,10 @@
     <parent>
         <groupId>tools.dynamia.modules</groupId>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <artifactId>tools.dynamia.modules.saas</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <name>DynamiaModules - SaaS Core</name>
     <url>https://www.dynamia.tools/modules/saas</url>
 
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.api</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.jpa</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/sources/jpa/pom.xml b/sources/jpa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
         <groupId>tools.dynamia.modules</groupId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>DynamiaModules - SaaS JPA</name>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.api</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>tools.dynamia</groupId>

diff --git a/sources/pom.xml b/sources/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>tools.dynamia.modules</groupId>
     <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <packaging>pom</packaging>
     <name>DynamiaModules - SaaS</name>
     <description>DynamiaTools extension to create SaaS applications with accounts control and multi tenants in same
@@ -59,7 +59,7 @@
     </scm>
 
     <properties>
-        <dynamiatools.version>5.1.1</dynamiatools.version>
+        <dynamiatools.version>5.1.2</dynamiatools.version>
         <entityfiles.version>7.1.1</entityfiles.version>
         <java.version>17</java.version>
         <maven.compiler>3.12.1</maven.compiler>

diff --git a/sources/remote/pom.xml b/sources/remote/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
         <groupId>tools.dynamia.modules</groupId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.jpa</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->
         <dependency>

diff --git a/sources/ui/pom.xml b/sources/ui/pom.xml
@@ -22,10 +22,10 @@
     <parent>
         <groupId>tools.dynamia.modules</groupId>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <artifactId>tools.dynamia.modules.saas.ui</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <name>DynamiaModules - SaaS UI</name>
     <url>https://www.dynamia.tools/modules/saas</url>