Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
15
Issues
15
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
1d4f4672
Commit
1d4f4672
authored
Aug 05, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved bugs in KPI persistence
parent
71e20144
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
src/main/java/org/genesys2/server/persistence/domain/kpi/ExecutionRunRepository.java
...server/persistence/domain/kpi/ExecutionRunRepository.java
+5
-0
src/main/java/org/genesys2/server/persistence/domain/kpi/ObservationRepository.java
.../server/persistence/domain/kpi/ObservationRepository.java
+2
-2
src/main/java/org/genesys2/server/service/KPIService.java
src/main/java/org/genesys2/server/service/KPIService.java
+1
-2
src/main/java/org/genesys2/server/service/impl/KPIServiceImpl.java
...java/org/genesys2/server/service/impl/KPIServiceImpl.java
+3
-2
src/test/java/org/genesys2/server/service/impl/KPIEntitiesTest.java
...ava/org/genesys2/server/service/impl/KPIEntitiesTest.java
+5
-2
No files found.
src/main/java/org/genesys2/server/persistence/domain/kpi/ExecutionRunRepository.java
View file @
1d4f4672
...
...
@@ -22,6 +22,7 @@ import org.genesys2.server.model.kpi.Execution;
import
org.genesys2.server.model.kpi.ExecutionRun
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Query
;
public
interface
ExecutionRunRepository
extends
JpaRepository
<
ExecutionRun
,
Long
>
{
...
...
@@ -31,4 +32,8 @@ public interface ExecutionRunRepository extends JpaRepository<ExecutionRun, Long
@Query
(
"select er from ExecutionRun er where er.execution=?1 order by er.timestamp desc"
)
List
<
ExecutionRun
>
findLast
(
Execution
execution
,
Pageable
pageable
);
@Modifying
@Query
(
"delete from ExecutionRun er where er.execution=?1"
)
void
deleteByExecution
(
Execution
execution
);
}
src/main/java/org/genesys2/server/persistence/domain/kpi/ObservationRepository.java
View file @
1d4f4672
...
...
@@ -36,7 +36,7 @@ public interface ObservationRepository extends JpaRepository<Observation, Long>,
List
<
Observation
>
listObservationsByDimensionKey
(
Execution
execution
,
DimensionKey
next
,
Pageable
page
);
@Modifying
@Query
(
"delete from Observation o where o.executionRun
.execution
=?1"
)
void
deleteByExecution
(
Execution
executio
n
);
@Query
(
"delete from Observation o where o.executionRun=?1"
)
void
deleteByExecution
Run
(
ExecutionRun
executionRu
n
);
}
src/main/java/org/genesys2/server/service/KPIService.java
View file @
1d4f4672
...
...
@@ -64,11 +64,10 @@ public interface KPIService {
List
<
Execution
>
listExecutions
();
void
deleteObservations
(
Execution
execution
);
List
<
Observation
>
listObservations
(
ExecutionRun
executionRun
,
Map
<
String
,
String
>
dimensionFilters
,
Pageable
page
);
ExecutionRun
getLastExecutionRun
(
Execution
execution
);
void
deleteObservations
(
ExecutionRun
executionRun
);
}
src/main/java/org/genesys2/server/service/impl/KPIServiceImpl.java
View file @
1d4f4672
...
...
@@ -173,6 +173,7 @@ public class KPIServiceImpl implements KPIService {
@Transactional
public
Execution
delete
(
Execution
execution
)
{
// Execption thrown if there are Observations (which is okay).
executionRunRepository
.
deleteByExecution
(
execution
);
executionRepository
.
delete
(
execution
);
execution
.
setId
(
null
);
return
execution
;
...
...
@@ -181,8 +182,8 @@ public class KPIServiceImpl implements KPIService {
@PreAuthorize
(
"hasRole('ADMINISTRATOR') or hasPermission(#execution, 'ADMINISTRATION')"
)
@Override
@Transactional
public
void
deleteObservations
(
Execution
executio
n
)
{
observationRepository
.
deleteByExecution
(
executio
n
);
public
void
deleteObservations
(
Execution
Run
executionRu
n
)
{
observationRepository
.
deleteByExecution
Run
(
executionRu
n
);
}
@Override
...
...
src/test/java/org/genesys2/server/service/impl/KPIEntitiesTest.java
View file @
1d4f4672
...
...
@@ -32,6 +32,7 @@ import org.genesys2.server.model.kpi.Dimension;
import
org.genesys2.server.model.kpi.DimensionKey
;
import
org.genesys2.server.model.kpi.Execution
;
import
org.genesys2.server.model.kpi.ExecutionDimension
;
import
org.genesys2.server.model.kpi.ExecutionRun
;
import
org.genesys2.server.model.kpi.JpaDimension
;
import
org.genesys2.server.model.kpi.KPIParameter
;
import
org.genesys2.server.model.kpi.NumericListDimension
;
...
...
@@ -300,7 +301,8 @@ public class KPIEntitiesTest {
// drop it
log
.
info
(
"DELETING!!!!"
);
kpiService
.
deleteObservations
(
execution
);
ExecutionRun
executionRun
=
kpiService
.
getLastExecutionRun
(
execution
);
kpiService
.
deleteObservations
(
executionRun
);
kpiService
.
delete
(
execution
);
// Let's check DimensionKey again
...
...
@@ -309,7 +311,8 @@ public class KPIEntitiesTest {
log
.
info
(
"DK="
+
dk
);
}
kpiService
.
deleteObservations
(
execution2
);
ExecutionRun
executionRun2
=
kpiService
.
getLastExecutionRun
(
execution2
);
kpiService
.
deleteObservations
(
executionRun2
);
kpiService
.
delete
(
execution2
);
}
}
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