Skip to content

Commit 919e9af

Browse files
Merge pull request #7 from dynamiatools/3.x
v3.1.3
2 parents 89092a5 + 68a022d commit 919e9af

File tree

8 files changed

+40
-19
lines changed

8 files changed

+40
-19
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@ Add the following dependencies to project classpath
2626
<dependency>
2727
<groupId>tools.dynamia.modules</groupId>
2828
<artifactId>tools.dynamia.modules.saas</artifactId>
29-
<version>3.1.0</version>
29+
<version>3.1.3</version>
3030
</dependency>
3131
```
3232

3333
```xml
3434
<dependency>
3535
<groupId>tools.dynamia.modules</groupId>
3636
<artifactId>tools.dynamia.modules.saas.ui</artifactId>
37-
<version>3.1.0</version>
37+
<version>3.1.3</version>
3838
</dependency>
3939

4040
```
4141

4242
**Gradle**
4343

4444
```groovy
45-
compile 'tools.dynamia.modules:tools.dynamia.modules.saas:3.1.0'
46-
compile 'tools.dynamia.modules:tools.dynamia.modules.saas.ui:3.1.0'
45+
compile 'tools.dynamia.modules:tools.dynamia.modules.saas:3.1.3'
46+
compile 'tools.dynamia.modules:tools.dynamia.modules.saas.ui:3.1.3'
4747
```
4848

4949
## Usage
@@ -82,7 +82,7 @@ For your modules you only require the API dependency
8282
<dependency>
8383
<groupId>tools.dynamia.modules</groupId>
8484
<artifactId>tools.dynamia.modules.saas.api</artifactId>
85-
<version>3.1.0</version>
85+
<version>3.1.3</version>
8686
</dependency>
8787
```
8888

sources/api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<parent>
2727
<groupId>tools.dynamia.modules</groupId>
2828
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
29-
<version>3.1.2</version>
29+
<version>3.1.3</version>
3030
</parent>
3131
<artifactId>tools.dynamia.modules.saas.api</artifactId>
3232

3333
<name>DynamiaModules - SaaS API</name>
3434
<url>https://www.dynamia.tools/modules/saas</url>
35-
<version>3.1.2</version>
35+
<version>3.1.3</version>
3636

3737
<build>
3838
<plugins>

sources/core/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<parent>
2323
<groupId>tools.dynamia.modules</groupId>
2424
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.3</version>
2626
</parent>
2727
<artifactId>tools.dynamia.modules.saas</artifactId>
28-
<version>3.1.2</version>
28+
<version>3.1.3</version>
2929
<name>DynamiaModules - SaaS Core</name>
3030
<url>https://www.dynamia.tools/modules/saas</url>
3131

@@ -49,12 +49,12 @@
4949
<dependency>
5050
<groupId>tools.dynamia.modules</groupId>
5151
<artifactId>tools.dynamia.modules.saas.api</artifactId>
52-
<version>3.1.2</version>
52+
<version>3.1.3</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>tools.dynamia.modules</groupId>
5656
<artifactId>tools.dynamia.modules.saas.jpa</artifactId>
57-
<version>3.1.2</version>
57+
<version>3.1.3</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>junit</groupId>

sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountCategory.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package tools.dynamia.modules.saas.domain;
1919

20+
import jakarta.persistence.ManyToOne;
2021
import org.hibernate.annotations.BatchSize;
2122
import tools.dynamia.domain.Descriptor;
2223
import tools.dynamia.domain.jpa.SimpleEntity;
@@ -28,13 +29,17 @@
2829

2930
@Entity
3031
@Table(name = "saas_categories")
31-
@Descriptor(fields = "name")
32+
@Descriptor(fields = {"name", "defaultAccountType", "defaultAccountProfile"})
3233
@BatchSize(size = 20)
3334
public class AccountCategory extends SimpleEntity {
3435

3536
@NotNull
3637
@Column(unique = true)
3738
private String name;
39+
@ManyToOne
40+
private AccountType defaultAccountType;
41+
@ManyToOne
42+
private AccountProfile defaultAccountProfile;
3843

3944
public String getName() {
4045
return name;
@@ -44,6 +49,22 @@ public void setName(String name) {
4449
this.name = name;
4550
}
4651

52+
public AccountType getDefaultAccountType() {
53+
return defaultAccountType;
54+
}
55+
56+
public void setDefaultAccountType(AccountType defaultAccountType) {
57+
this.defaultAccountType = defaultAccountType;
58+
}
59+
60+
public AccountProfile getDefaultAccountProfile() {
61+
return defaultAccountProfile;
62+
}
63+
64+
public void setDefaultAccountProfile(AccountProfile defaultAccountProfile) {
65+
this.defaultAccountProfile = defaultAccountProfile;
66+
}
67+
4768
@Override
4869
public String toString() {
4970
return name;

sources/jpa/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
2424
<groupId>tools.dynamia.modules</groupId>
25-
<version>3.1.2</version>
25+
<version>3.1.3</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828
<name>DynamiaModules - SaaS JPA</name>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>tools.dynamia.modules</groupId>
3535
<artifactId>tools.dynamia.modules.saas.api</artifactId>
36-
<version>3.1.2</version>
36+
<version>3.1.3</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>tools.dynamia</groupId>

sources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<groupId>tools.dynamia.modules</groupId>
2323
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.3</version>
2525
<packaging>pom</packaging>
2626
<name>DynamiaModules - SaaS</name>
2727
<description>DynamiaTools extension to create SaaS applications with accounts control and multi tenants in same

sources/remote/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
2424
<groupId>tools.dynamia.modules</groupId>
25-
<version>3.1.2</version>
25+
<version>3.1.3</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>tools.dynamia.modules</groupId>
3737
<artifactId>tools.dynamia.modules.saas.jpa</artifactId>
38-
<version>3.1.2</version>
38+
<version>3.1.3</version>
3939
</dependency>
4040
<!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->
4141
<dependency>

sources/ui/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<parent>
2323
<groupId>tools.dynamia.modules</groupId>
2424
<artifactId>tools.dynamia.modules.saas.parent</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.3</version>
2626
</parent>
2727
<artifactId>tools.dynamia.modules.saas.ui</artifactId>
28-
<version>3.1.2</version>
28+
<version>3.1.3</version>
2929
<name>DynamiaModules - SaaS UI</name>
3030
<url>https://www.dynamia.tools/modules/saas</url>
3131

0 commit comments

Comments
 (0)