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
19
Issues
19
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
d466d8cd
Commit
d466d8cd
authored
Sep 04, 2018
by
Viacheslav Pavlov
Committed by
Matija Obreza
Sep 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added converter from AccessionIdentifier3 to genesys UUID
parent
53fb86ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
0 deletions
+46
-0
src/main/java/org/genesys2/server/api/v1/AccessionController.java
.../java/org/genesys2/server/api/v1/AccessionController.java
+14
-0
src/main/java/org/genesys2/server/service/AccessionService.java
...in/java/org/genesys2/server/service/AccessionService.java
+10
-0
src/main/java/org/genesys2/server/service/impl/AccessionServiceImpl.java
...rg/genesys2/server/service/impl/AccessionServiceImpl.java
+22
-0
No files found.
src/main/java/org/genesys2/server/api/v1/AccessionController.java
View file @
d466d8cd
...
...
@@ -17,6 +17,7 @@
package
org.genesys2.server.api.v1
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.UUID
;
...
...
@@ -27,7 +28,9 @@ import org.genesys.blocks.model.JsonViews;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.service.ShortFilterService
;
import
org.genesys2.server.api.ApiBaseController
;
import
org.genesys2.server.api.model.AccessionHeaderJson
;
import
org.genesys2.server.model.genesys.Accession
;
import
org.genesys2.server.model.impl.AccessionIdentifier3
;
import
org.genesys2.server.service.AccessionService
;
import
org.genesys2.server.service.ElasticsearchService
;
import
org.genesys2.server.service.ElasticsearchService.TermResult
;
...
...
@@ -162,6 +165,17 @@ public class AccessionController {
return
elasticsearchService
.
termStatisticsAuto
(
Accession
.
class
,
filter
,
10
,
terms
.
toArray
(
new
String
[]
{}));
}
/**
* Converts AccessionIdentifiers to UUID
* @param identifiers accession identifiers to lookup in DB
* @return map with UUIDs and related AccessionIdentifiers
*/
@PostMapping
(
value
=
"/toUUID"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Map
<
UUID
,
AccessionIdentifier3
>
toUUID
(
@RequestBody
List
<
AccessionHeaderJson
>
identifiers
)
{
return
accessionService
.
toUUID
(
identifiers
);
}
/**
* Get term overview for filters
*
...
...
src/main/java/org/genesys2/server/service/AccessionService.java
View file @
d466d8cd
...
...
@@ -15,9 +15,12 @@
*/
package
org.genesys2.server.service
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
import
org.genesys2.server.model.genesys.Accession
;
import
org.genesys2.server.model.impl.AccessionIdentifier3
;
import
org.genesys2.server.service.filter.AccessionFilter
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
...
...
@@ -48,4 +51,11 @@ public interface AccessionService {
* @return the by doi
*/
Accession
getByDoi
(
String
doi
);
/**
* Converts AccessionIdentifiers to UUID
* @param identifiers accession identifiers to lookup in DB
* @return map with UUIDs and related AccessionIdentifiers
*/
Map
<
UUID
,
AccessionIdentifier3
>
toUUID
(
List
<?
extends
AccessionIdentifier3
>
identifiers
);
}
src/main/java/org/genesys2/server/service/impl/AccessionServiceImpl.java
View file @
d466d8cd
...
...
@@ -17,10 +17,14 @@ package org.genesys2.server.service.impl;
import
java.util.List
;
import
java.util.UUID
;
import
java.util.Map
;
import
java.util.HashMap
;
import
java.util.Optional
;
import
org.genesys2.server.model.genesys.Accession
;
import
org.genesys2.server.model.genesys.AccessionData
;
import
org.genesys2.server.model.genesys.AccessionId
;
import
org.genesys2.server.model.impl.AccessionIdentifier3
;
import
org.genesys2.server.persistence.AccessionRepository
;
import
org.genesys2.server.service.AccessionService
;
import
org.genesys2.server.service.ElasticsearchService
;
...
...
@@ -97,6 +101,24 @@ public class AccessionServiceImpl implements AccessionService {
return
lazyLoad
(
accessionRepository
.
findByDoi
(
doi
));
}
@Override
public
Map
<
UUID
,
AccessionIdentifier3
>
toUUID
(
List
<?
extends
AccessionIdentifier3
>
identifiers
)
{
Map
<
UUID
,
AccessionIdentifier3
>
res
=
new
HashMap
<>();
List
<
Accession
>
foundAccessions
=
accessionRepository
.
findById
(
identifiers
);
for
(
Accession
accession:
foundAccessions
)
{
Optional
<?
extends
AccessionIdentifier3
>
toPut
=
identifiers
.
stream
()
.
filter
(
id
->
id
.
getAccessionNumber
().
equals
(
accession
.
getAccessionNumber
())
&&
id
.
getGenus
().
equals
(
accession
.
getGenus
())
&&
id
.
getHoldingInstitute
().
equals
(
accession
.
getInstCode
())
).
findFirst
();
toPut
.
ifPresent
(
accessionIdentifier3
->
res
.
put
(
accession
.
getUuid
(),
accessionIdentifier3
));
}
return
res
;
}
/*
* (non-Javadoc)
* @see
...
...
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