Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ejercicio2-framework-back
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Josue
ejercicio2-framework-back
Commits
953a24f5
Commit
953a24f5
authored
Dec 14, 2021
by
Roberto Loayza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aumento del uso del periodo para la eliminación de data sensible según agente.
parent
b5175844
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
AgentBean.java
src/main/java/com/bytesw/bytebot/bean/AgentBean.java
+4
-0
Agent.java
src/main/java/com/bytesw/bytebot/model/Agent.java
+2
-1
AgentService.java
src/main/java/com/bytesw/bytebot/service/AgentService.java
+2
-0
No files found.
src/main/java/com/bytesw/bytebot/bean/AgentBean.java
View file @
953a24f5
...
@@ -6,6 +6,7 @@ import lombok.Getter;
...
@@ -6,6 +6,7 @@ import lombok.Getter;
import
lombok.Setter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
lombok.ToString
;
import
java.math.BigInteger
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -56,6 +57,9 @@ public class AgentBean {
...
@@ -56,6 +57,9 @@ public class AgentBean {
@Expose
@Expose
private
String
type
;
private
String
type
;
@Expose
private
int
period
;
@Expose
@Expose
private
List
<
DeploymentChannelBean
>
deploymentChannels
;
private
List
<
DeploymentChannelBean
>
deploymentChannels
;
...
...
src/main/java/com/bytesw/bytebot/model/Agent.java
View file @
953a24f5
...
@@ -13,6 +13,7 @@ import org.hibernate.annotations.Type;
...
@@ -13,6 +13,7 @@ import org.hibernate.annotations.Type;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigInteger
;
import
java.util.List
;
import
java.util.List
;
@Entity
@Entity
...
@@ -45,7 +46,7 @@ public class Agent implements Serializable {
...
@@ -45,7 +46,7 @@ public class Agent implements Serializable {
private
String
timezone
;
private
String
timezone
;
@Column
(
name
=
"agen_delete_sensible_period"
)
@Column
(
name
=
"agen_delete_sensible_period"
)
private
String
period
;
private
int
period
;
@Lob
@Lob
@Type
(
type
=
"org.hibernate.type.TextType"
)
@Type
(
type
=
"org.hibernate.type.TextType"
)
...
...
src/main/java/com/bytesw/bytebot/service/AgentService.java
View file @
953a24f5
...
@@ -142,6 +142,7 @@ public class AgentService extends CustomPaginationService<Agent> {
...
@@ -142,6 +142,7 @@ public class AgentService extends CustomPaginationService<Agent> {
agentBD
.
setVersion
(
agent
.
getVersion
());
agentBD
.
setVersion
(
agent
.
getVersion
());
agentBD
.
setType
(
AgentTypeEnum
.
fromString
(
agent
.
getType
()));
agentBD
.
setType
(
AgentTypeEnum
.
fromString
(
agent
.
getType
()));
agentBD
.
setAvatar
(
agent
.
getAvatar
());
agentBD
.
setAvatar
(
agent
.
getAvatar
());
agentBD
.
setPeriod
(
agent
.
getPeriod
());
if
(
agent
.
getCountryId
()
!=
null
)
{
if
(
agent
.
getCountryId
()
!=
null
)
{
Optional
<
Country
>
countryFound
=
countryRepository
.
findById
(
agent
.
getCountryId
());
Optional
<
Country
>
countryFound
=
countryRepository
.
findById
(
agent
.
getCountryId
());
...
@@ -360,6 +361,7 @@ public class AgentService extends CustomPaginationService<Agent> {
...
@@ -360,6 +361,7 @@ public class AgentService extends CustomPaginationService<Agent> {
bean
.
setType
(
agent
.
getType
().
getName
());
bean
.
setType
(
agent
.
getType
().
getName
());
bean
.
setStatus
(
agent
.
getStatus
().
getName
());
bean
.
setStatus
(
agent
.
getStatus
().
getName
());
bean
.
setAvatar
(
agent
.
getAvatar
());
bean
.
setAvatar
(
agent
.
getAvatar
());
bean
.
setPeriod
(
agent
.
getPeriod
());
if
(
agent
.
getCountry
()
!=
null
)
{
if
(
agent
.
getCountry
()
!=
null
)
{
bean
.
setCountryName
(
agent
.
getCountry
().
getName
());
bean
.
setCountryName
(
agent
.
getCountry
().
getName
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment