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
45
Issues
45
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
54cd8a2f
Commit
54cd8a2f
authored
Mar 05, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SGSVUpdate tests
parent
1362dae5
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
556 additions
and
119 deletions
+556
-119
src/main/java/org/genesys2/server/persistence/domain/FaoInstituteSettingRepository.java
...ver/persistence/domain/FaoInstituteSettingRepository.java
+6
-0
src/main/java/org/genesys2/server/service/InstituteService.java
...in/java/org/genesys2/server/service/InstituteService.java
+2
-0
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
.../org/genesys2/server/service/impl/GenesysServiceImpl.java
+3
-3
src/main/java/org/genesys2/server/service/impl/InstituteServiceImpl.java
...rg/genesys2/server/service/impl/InstituteServiceImpl.java
+10
-0
src/main/java/org/genesys2/server/service/worker/SGSVEntry.java
...in/java/org/genesys2/server/service/worker/SGSVEntry.java
+4
-1
src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java
...n/java/org/genesys2/server/service/worker/SGSVUpdate.java
+163
-111
src/test/java/org/genesys2/server/service/worker/SGSVUpdateTest.java
...va/org/genesys2/server/service/worker/SGSVUpdateTest.java
+364
-0
src/test/java/org/genesys2/server/test/TokensCleanupTest.java
...test/java/org/genesys2/server/test/TokensCleanupTest.java
+2
-2
src/test/resources/log4j.properties
src/test/resources/log4j.properties
+1
-1
src/test/resources/spring/hibernate.properties
src/test/resources/spring/hibernate.properties
+1
-1
No files found.
src/main/java/org/genesys2/server/persistence/domain/FaoInstituteSettingRepository.java
View file @
54cd8a2f
...
...
@@ -18,8 +18,14 @@ package org.genesys2.server.persistence.domain;
import
org.genesys2.server.model.impl.FaoInstituteSetting
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Query
;
public
interface
FaoInstituteSettingRepository
extends
JpaRepository
<
FaoInstituteSetting
,
Long
>
{
FaoInstituteSetting
findByInstCodeAndSetting
(
String
instCode
,
String
setting
);
@Modifying
@Query
(
"DELETE FROM FaoInstituteSetting fis WHERE fis.instCode = ?1"
)
void
deleteFor
(
String
instCode
);
}
src/main/java/org/genesys2/server/service/InstituteService.java
View file @
54cd8a2f
...
...
@@ -59,4 +59,6 @@ public interface InstituteService {
void
setUniqueAcceNumbs
(
FaoInstitute
faoInstitute
,
boolean
uniqueAcceNumbs
);
void
delete
(
String
instCode
);
}
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
View file @
54cd8a2f
...
...
@@ -213,10 +213,10 @@ public class GenesysServiceImpl implements GenesysService, TraitService, Dataset
// Including null's
result
.
add
(
accn
);
if
(
accn
==
null
)
{
FaoInstitute
inst
=
instituteRepository
.
findByCode
(
aid3
.
getHoldingInstitute
());
if
(
inst
==
null
)
//
FaoInstitute inst = instituteRepository.findByCode(aid3.getHoldingInstitute());
if
(
LOG
.
isDebugEnabled
()
)
// Only log full miss
LOG
.
debug
(
"No accession "
+
aid3
+
" in "
+
inst
);
LOG
.
debug
(
"No accession "
+
aid3
);
}
}
return
result
;
...
...
src/main/java/org/genesys2/server/service/impl/InstituteServiceImpl.java
View file @
54cd8a2f
...
...
@@ -179,4 +179,14 @@ public class InstituteServiceImpl implements InstituteService {
return
organizationRepository
.
getOrganizations
(
faoInstitute
);
}
@Override
@Transactional
@PreAuthorize
(
"hasRole('ADMINISTRATOR')"
)
public
void
delete
(
String
instCode
)
{
FaoInstitute
institute
=
getInstitute
(
instCode
);
if
(
institute
!=
null
)
{
instituteSettingRepository
.
deleteFor
(
institute
.
getCode
());
instituteRepository
.
delete
(
institute
);
}
}
}
src/main/java/org/genesys2/server/service/worker/SGSVEntry.java
View file @
54cd8a2f
...
...
@@ -15,7 +15,10 @@ class SGSVEntry implements AccessionIdentifier3 {
String
boxNo
;
String
depositDate
;
Float
quantity
;
public
SGSVEntry
()
{
}
public
SGSVEntry
(
String
[]
entry
)
{
instCode
=
entry
[
1
];
acceNumb
=
entry
[
4
];
...
...
src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java
View file @
54cd8a2f
This diff is collapsed.
Click to expand it.
src/test/java/org/genesys2/server/service/worker/SGSVUpdateTest.java
0 → 100644
View file @
54cd8a2f
This diff is collapsed.
Click to expand it.
src/test/java/org/genesys2/server/test/
Jpa
Test.java
→
src/test/java/org/genesys2/server/test/
TokensCleanup
Test.java
View file @
54cd8a2f
...
...
@@ -14,10 +14,10 @@ import static org.junit.Assert.fail;
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@ContextConfiguration
(
classes
=
Jpa
Test
.
Config
.
class
,
classes
=
TokensCleanup
Test
.
Config
.
class
,
initializers
=
PropertyPlacholderInitializer
.
class
)
public
class
Jpa
Test
{
public
class
TokensCleanup
Test
{
@Import
(
JpaDataConfig
.
class
)
public
static
class
Config
{
...
...
src/test/resources/log4j.properties
View file @
54cd8a2f
...
...
@@ -29,4 +29,4 @@ log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
### set log levels - for more verbose logging change 'info' to 'debug' ###
log4j.rootLogger
=
info, stdout
log4j.category.org.
crophub
=
info
log4j.category.org.
genesys2
=
debug
src/test/resources/spring/hibernate.properties
View file @
54cd8a2f
#Hibernate specific properties
hibernate.dialect
=
org.hibernate.dialect.HSQLDialect
hibernate.connection.autocommit
=
fals
e
hibernate.connection.autocommit
=
tru
e
hibernate.hbm2ddl.auto
=
update
hibernate.search.default.indexBase
=
./lucene/
hibernate.search.default.exclusive_index_use
=
false
...
...
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