Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
INB
eTRANSAFE
pretox-rest-api
Commits
fe30117a
Commit
fe30117a
authored
Nov 10, 2021
by
Javi Corvi
Browse files
new version of tabs and bug fixes
parent
b829daf6
Pipeline
#25778
passed with stage
in 4 minutes and 46 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/es/bsc/inb/ades/rest/api/controllers/DocumentController.java
View file @
fe30117a
...
...
@@ -76,6 +76,12 @@ public class DocumentController {
return
"true"
;
}
@RequestMapping
(
"/documents/{id}/srFindingValidation/{srDomainId}/{status}"
)
public
String
setSRFindingValidation
(
@PathVariable
(
value
=
"id"
)
Long
id
,
@PathVariable
(
value
=
"srDomainId"
)
Integer
srDomainId
,
@PathVariable
(
value
=
"status"
)
String
status
)
{
documentService
.
setValidationSRDomainFinding
(
id
,
srDomainId
,
status
);
return
"true"
;
}
@RequestMapping
(
"/documents/{id}/findingValidation/{findingId}/{status}"
)
public
String
setFindingValidation
(
@PathVariable
(
value
=
"id"
)
Long
id
,
@PathVariable
(
value
=
"findingId"
)
Integer
findingId
,
@PathVariable
(
value
=
"status"
)
String
status
)
{
documentService
.
setFindingValidation
(
id
,
findingId
,
status
);
...
...
src/main/java/es/bsc/inb/ades/rest/api/model/SRDomainFinding.java
View file @
fe30117a
...
...
@@ -40,6 +40,22 @@ public class SRDomainFinding implements Cloneable{
private
String
SRTRTEF
=
""
;
private
String
SRCOMNT
=
""
;
private
Boolean
export
;
private
Integer
findingId
;
private
Integer
srDomainId
;
private
String
status
=
"non_curated"
;
public
String
getStatus
()
{
return
status
;
}
public
void
setStatus
(
String
status
)
{
this
.
status
=
status
;
}
public
String
getSrdomain_value
()
{
return
SRDOMAIN_DESC
+
"("
+
SRDOMAIN
+
")"
;
}
...
...
@@ -72,9 +88,7 @@ public class SRDomainFinding implements Cloneable{
return
SRSPEC_DESC
+
"("
+
SRSPEC
+
")"
;
}
private
Boolean
export
;
private
Integer
findingId
;
private
Integer
srDomainId
;
public
String
getSTUDYID
()
{
return
STUDYID
;
...
...
src/main/java/es/bsc/inb/ades/rest/api/services/DocumentService.java
View file @
fe30117a
...
...
@@ -36,6 +36,8 @@ public interface DocumentService {
Boolean
setExportSRDomainFinding
(
Long
id
,
Integer
findingId
,
Boolean
export_srdomain
);
Boolean
setValidationSRDomainFinding
(
Long
id
,
Integer
srDomainFindingId
,
String
status
);
Boolean
setFindingValidation
(
Long
id
,
Integer
findingId
,
String
status
);
Status
moveDocument
(
Long
id
,
Status
status
);
...
...
src/main/java/es/bsc/inb/ades/rest/api/services/DocumentServiceImpl.java
View file @
fe30117a
...
...
@@ -128,8 +128,34 @@ public class DocumentServiceImpl implements DocumentService {
return
false
;
}
@Override
public
Boolean
setValidationSRDomainFinding
(
Long
id
,
Integer
srDomainFindingId
,
String
status
)
{
DocumentAnnotations
documentAnnotations
=
this
.
findDocumentAnnotationsByDocumentId
(
id
);
SRDomainFinding
srDomainFindingelected
=
null
;
for
(
Annotation
annotation
:
documentAnnotations
.
getRelevantSentences
())
{
for
(
Finding
finding
:
annotation
.
getFindings
())
{
for
(
SRDomainFinding
srDomainFinding
:
finding
.
getSrDomainFindings
())
{
if
(
srDomainFinding
.
getSrDomainId
().
equals
(
srDomainFindingId
))
{
srDomainFindingelected
=
srDomainFinding
;
break
;
}
}
}
}
if
(
srDomainFindingelected
!=
null
)
{
//https://stackoverflow.com/questions/47699646/updating-replacing-a-deeply-nested-object-in-mongodb-with-spring-data-mongodb
srDomainFindingelected
.
setStatus
(
status
);
documentAnnotationsRepository
.
save
(
documentAnnotations
);
createTracking
(
id
,
"admin"
,
Action
.
ACCEPT
,
srDomainFindingelected
.
getTrackingSummary
());
return
true
;
}
return
false
;
}
@Override
public
Boolean
setExportSRDomainFinding
(
Long
id
,
Integer
srDomainId
,
Boolean
export_srdomainfinding
)
{
System
.
out
.
println
(
"Entra:"
+
srDomainId
);
DocumentAnnotations
documentAnnotations
=
this
.
findDocumentAnnotationsByDocumentId
(
id
);
SRDomainFinding
sRDomainFindingSelected
=
null
;
for
(
Annotation
annotation
:
documentAnnotations
.
getRelevantSentences
())
{
...
...
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