Skip to content
Snippets Groups Projects
Commit b3d48c1e authored by Martin Weise's avatar Martin Weise
Browse files

disregard the timestamps for now

Former-commit-id: 2ff48340
parent acc8f439
No related branches found
No related tags found
1 merge request!42Fixed the query service tests
Showing
with 313 additions and 9464 deletions
This diff is collapsed.
id,name,selection,company,numbers,age
1,Mr. Malcolm Hurst,mk,TUW,0.714861135705187,81
2,Owen Davies,ac,CTS,0.679518130821835,94
3,Kieran Price,ac,HTC,0.805365365494247,89
4,Gerald Bailey,em,CTS,0.660588429295931,53
5,Reece Jarvis,zf,TUW,0.815027768264326,25
6,Shane Watkins,zf,CTS,0.598471482003992,91
7,Mr. Iain Wallace,zf,TUW,0.181025300948285,43
8,Dr. Ben Harding,mk,CTS,0.063828128135503,23
9,Ms. Dorothy Jones,mk,CTS,0.054220977271867,98
10,Ms. Diana Cooke,mk,CTS,0.589505311984297,74
11,Anne Berry,zf,HTC,0.426555505189365,80
12,Frank Shah,em,TUW,0.508107759568465,73
13,Holly Anderson,em,CTS,0.334871912083153,7
14,Carole Smith,ac,TUW,0.03147663760707,57
15,Dr. Patrick Burgess,zf,CTS,0.271691779243745,23
16,Mr. Jack Richards,mk,TUW,0.613106724996894,33
17,Martyn Spencer,ac,TUW,0.275349067136772,59
18,Ms. Emily Poole,mk,CTS,0.818113945996567,65
19,Joshua Rees,em,TUW,0.580263443341943,51
20,Dr. Kevin Phillips,ac,TUW,0.017264657273931,0
21,Miss Valerie Hughes,zf,TUW,0.955673544406111,46
22,Louise Craig,em,TUW,0.386060430081036,28
23,Jean Thorpe,ac,CTS,0.980326966466183,15
24,Billy Reid,mk,TUW,0.027777082038612,23
25,Mrs. Rachael Wilkinson,mk,TUW,0.093889924430777,16
26,Shane Atkinson,ac,CTS,0.613395979357626,35
27,Dr. Joanne Begum,ac,HTC,0.932052620799215,34
28,Patrick James-Page,ac,HTC,0.103483883204472,57
29,Mr. Edward Gardiner,mk,HTC,0.377007578824815,97
30,Dr. Gary Burton,ac,CTS,0.727631440614909,83
31,Anthony Smith-Wood,zf,CTS,0.121817959596152,94
32,Dr. Victoria Leach,mk,TUW,0.878059151922263,76
33,David Joyce,mk,HTC,0.732960955936736,42
34,Pamela Davies,zf,CTS,0.032399196300914,72
35,Helen Wong,zf,HTC,0.118651194885326,53
36,Rachael Kirby-Jones,zf,CTS,0.674933066645934,30
37,Alexandra Taylor,zf,HTC,0.157977533322709,78
38,Natasha Turner-White,em,CTS,0.930564921555639,51
39,Olivia Edwards,ac,CTS,0.259496494754335,64
40,Mr. Dean Gardner,em,CTS,0.434973342119374,34
41,Justin Bailey,em,HTC,0.852457608866943,36
42,Howard Wilkinson,ac,CTS,0.197279311991477,64
43,Mr. Julian Foster,ac,HTC,0.854813950241198,49
44,Dr. Abdul Hussain,em,TUW,0.387708901294869,7
45,Andrea Lawrence,em,TUW,0.578231556813177,56
46,Mandy Bell-Kemp,em,TUW,0.074898061167023,2
47,Karl West,mk,HTC,0.002281234459315,95
48,Maria Davis,mk,TUW,0.084768957083512,11
49,Dr. Judith Dodd,em,CTS,0.061545935114753,10
50,Aaron Griffiths,mk,TUW,0.649247895795788,89
name,selection,company,numbers,id,age
Mr. Gareth Potts,ac,HTC,0.794268696382794,1,80
Miss Elaine Marsh,zf,CTS,0.640229105835777,2,79
Miss Jessica Green,zf,HTC,0.993256549330382,3,17
Claire Barnett,zf,TUW,0.076840358492391,4,85
Matthew Johnson,mk,HTC,0.645606297104276,5,22
Justin Watts,mk,CTS,0.58665618387417,6,69
Mrs. Naomi Scott,zf,CTS,0.875676237794514,7,96
Sara Lewis,em,HTC,0.994980646126739,8,16
Olivia Graham,zf,CTS,0.922097384383084,9,6
Dawn Singh,mk,CTS,0.030346639331575,10,91
Bradley Carr,ac,CTS,0.603413802335632,11,91
Albert Johnson,ac,HTC,0.377892437118173,12,64
Karen Alexander-Hilton,ac,HTC,0.46989604486221,13,83
Miss Georgia Hewitt,em,CTS,0.49346630817125,14,85
Lynne Rogers,em,TUW,0.94578086923101,15,13
Lucy Stokes-Wilkinson,mk,HTC,0.0363750241227,16,43
George Wall-Yates,zf,CTS,0.52777269591895,17,36
Steven Holland-Anderson,ac,TUW,0.893174839423575,18,64
Mr. Antony Owen,em,HTC,0.580532069340212,19,44
Mr. Craig Ingram,em,HTC,0.127927611044504,20,94
Marie Cole-Fitzgerald,mk,CTS,0.87167677840818,21,66
Joel Murphy,zf,CTS,0.465969131504423,22,82
Kimberley Bryant,mk,HTC,0.887033630466286,23,6
Shannon Walker,mk,CTS,0.312768305820401,24,7
Dr. Jade Watson,ac,HTC,0.861706096729299,25,77
Harry Smith-Evans,mk,CTS,0.111304316854026,26,77
Ruth Barnes-Stanley,mk,HTC,0.989959894972877,27,21
Katie Hicks,zf,HTC,0.998535268447566,28,48
Gordon Blackburn,ac,CTS,0.355876956211766,29,94
David Leonard,zf,HTC,0.043970944118586,30,68
Damien Morgan,mk,CTS,0.551219742532389,31,32
Adrian Smith,ac,HTC,0.597064744097652,32,68
Kelly White,ac,TUW,0.927714118728666,33,68
Anne Lyons,em,CTS,0.281199779106915,34,67
Mrs. Emma Harris,ac,CTS,0.237194239542684,35,78
Anthony Howe,ac,CTS,0.251024826379141,36,50
Tony Brookes,mk,CTS,0.147234649339922,37,69
Molly Barber,zf,HTC,0.078438242878513,38,27
Paige Moss,zf,TUW,0.823254009942192,39,77
Dr. Jodie Hayes,mk,HTC,0.936575938811413,40,62
Josh Powell,zf,TUW,0.336122514821403,41,97
Hazel Walsh,em,TUW,0.432987343073676,42,35
Glenn Leach,ac,HTC,0.316078228936505,43,22
Shaun Wilson,ac,TUW,0.527682633721274,44,0
Nathan Reed,zf,CTS,0.091137954644425,45,74
Kelly Morris,mk,CTS,0.1236336817855,46,13
Dr. Derek Rogers,mk,CTS,0.523100334467998,47,79
Anne Barnes,zf,TUW,0.504633415739762,48,68
Dr. Ronald Schofield,mk,HTC,0.927773853690136,49,18
Miss Fiona Curtis,ac,TUW,0.47440874628726,50,18
uniquestr,method,company,measurements,id,trialn
YHTvcSAx,mk,CTS,0.838081921626884,66,61
EvWOCCDu,em,CTS,0.702728485772673,50,88
fcPFijjW,em,CTS,0.647390514568073,21,54
pOIAIomj,zf,TUW,0.733777769459938,23,20
ObWizSQb,ac,HTC,0.226500914995327,30,34
VgXvZCHg,zf,CTS,0.943543224460627,12,45
AMnqKChi,ac,TUW,0.611183987838414,27,51
SIhvGpqo,mk,TUW,0.920092435135557,60,89
FbMfQeAo,zf,HTC,0.476356685805905,10,60
wmepYxFe,em,CTS,0.574428895122785,47,32
ZjWfMoEN,zf,CTS,0.197191821844744,8,46
rxoKydLl,mk,HTC,0.961092995238006,57,43
kLcRygvt,ac,HTC,0.947706692641368,10,66
jvDXvNqa,em,CTS,0.843730557793115,2,57
aAAkRTNk,mk,TUW,0.020646729557714,22,29
TkrECMlz,mk,CTS,0.572263659295164,40,65
IYxwgyFP,ac,TUW,0.563997728966954,47,40
JuKDlDBZ,zf,TUW,0.82990783209135,37,61
EcLlHUvf,em,TUW,0.053086204489434,55,58
HsSyJoXQ,zf,HTC,0.42072184448776,56,19
qZPUgpBm,zf,HTC,0.728212717694442,66,28
iNjuuXnz,ac,TUW,0.647570732360196,16,87
whNrQSPa,em,CTS,0.477450138447353,28,70
hebQaokv,mk,TUW,0.451705033577547,61,47
MDhEbRXN,em,CTS,0.306952920274856,18,11
FmlDiVjH,zf,TUW,0.933443494135077,25,22
azjucWlJ,ac,TUW,0.229133885377041,51,85
whIvOEMo,mk,CTS,0.753244509324386,68,0
esWzIrLA,em,HTC,0.908849190410984,50,26
VfiLJDee,zf,TUW,0.737251068631787,37,31
pVWYPzhb,ac,TUW,0.204484347760193,35,46
LqnZeEML,mk,CTS,0.922579794233896,1,23
LwWlByPL,ac,HTC,0.359804187270286,59,73
QlcEkJEd,mk,TUW,0.439593454067527,52,16
Grgxwfhx,ac,HTC,0.559920479056256,17,68
VJwFyBQN,em,TUW,0.028416142161514,56,97
BSajktFP,ac,TUW,0.358361307364434,42,1
uXVVVqDK,mk,HTC,0.209423851285384,44,5
UOWBkhxu,ac,TUW,0.802698324477992,11,66
MrkDEiok,zf,CTS,0.641431310433939,9,85
cyNJKtcP,mk,TUW,0.452022286510014,42,76
EvuqZcow,mk,CTS,0.177630782748518,6,47
GsUPVjgi,ac,HTC,0.502905900691115,69,7
ncLuIgKI,zf,HTC,0.982277508808757,10,11
JpiyBFxl,em,HTC,0.093758487139878,69,49
OcLDLNlj,zf,TUW,0.136190705255779,25,49
GpZNhCGZ,zf,HTC,0.551659232829099,50,37
KAvxMwga,zf,TUW,0.010315400738497,47,68
KwFKBnXn,ac,TUW,0.196669175199031,53,59
nrMHiGVE,mk,HTC,0.05531923465714,15,51
nouniquestr,method,company,measurements,trialn
ZrkTh,mk,HTC,0.177063300549898,87
BldhL,em,CTS,0.400593813702581,37
Ilozw,zf,TUW,0.628808805518121,86
VoVbo,mk,CTS,0.383260169470526,73
qYaGa,ac,TUW,0.300094513785851,63
VVskT,ac,TUW,0.791980095199528,83
fqgcp,em,CTS,0.546252007591474,36
hSsYy,zf,HTC,0.169113457180949,97
NcPdv,ac,HTC,0.633851470617184,51
dUVcb,ac,HTC,0.325387530348436,61
ZrkTh,em,TUW,0.95353548900073,58
BldhL,ac,CTS,0.95353548900073,42
Ilozw,zf,CTS,0.955017839235524,47
VoVbo,mk,HTC,0.413882274982477,59
qYaGa,em,CTS,0.747618839292172,15
VVskT,ac,CTS,0.904490646907451,67
fqgcp,mk,CTS,0.956460196872499,75
hSsYy,em,TUW,0.697514416015923,1
NcPdv,mk,CTS,0.384387617827199,78
dUVcb,ac,CTS,0.321028751304939,72
ZrkTh,ac,TUW,0.339472130437016,84
BldhL,ac,TUW,0.162376699398776,20
Ilozw,ac,CTS,0.785804036695833,32
VoVbo,mk,CTS,0.392250406535102,83
qYaGa,em,CTS,0.781249987699388,62
VVskT,em,CTS,0.393822935688653,32
fqgcp,ac,HTC,0.210980953917901,49
hSsYy,zf,HTC,0.172914632872163,58
NcPdv,zf,HTC,0.253499203821194,7
dUVcb,mk,HTC,0.564504448420739,83
ZrkTh,zf,TUW,0.094958727629981,93
BldhL,em,TUW,0.003277362932808,79
Ilozw,zf,TUW,0.790078961813647,32
VoVbo,ac,CTS,0.222364934452437,28
qYaGa,mk,CTS,0.10974044631994,95
VVskT,zf,CTS,0.985770087143679,44
fqgcp,zf,HTC,0.787524986924583,8
hSsYy,mk,HTC,0.938681228308423,56
NcPdv,zf,TUW,0.273325679386618,53
dUVcb,ac,HTC,0.72782123520341,24
ZrkTh,em,HTC,0.090837236608906,95
BldhL,zf,CTS,0.975978030913906,77
Ilozw,em,CTS,0.048452291180372,29
VoVbo,ac,TUW,0.369869604569135,71
qYaGa,mk,HTC,0.185399041138233,49
VVskT,zf,HTC,0.341435842045672,70
fqgcp,mk,HTC,0.990966494923635,64
hSsYy,zf,CTS,0.65407557428769,74
NcPdv,mk,TUW,0.398683399619,59
dUVcb,ac,CTS,0.856327332047933,84
uniquestr,method,company,measurements,id,trialn
MqRxf,ac,HTC,0.161307118602035,1,5
ktTSC,ac,TUW,0.660955025210786,2,68
OAbog,em,CTS,0.758152424934482,3,52
nWLom,ac,HTC,0.697972038211538,4,75
xtKpQ,ac,TUW,0.607866970310272,5,35
nJbep,zf,HTC,0.92332863234525,6,99
,mk,CTS,0.246857514168771,7,35
hxLCQ,ac,CTS,0.701150166591524,8,90
hPUOj,em,TUW,0.638579584050992,9,38
fEgkr,zf,HTC,0.886887942877944,10,92
uvhBF,mk,CTS,0.937509073134592,11,7
umkoF,em,CTS,0.599276333861712,12,33
Rnmci,mk,TUW,0.486967163132331,13,29
fwbDJ,em,TUW,0.745479059117041,14,58
AIllD,zf,HTC,0.611069019995709,15,17
ovHcf,em,CTS,0.301276619864336,16,96
MmDqf,ac,HTC,0.763183083417903,17,51
,mk,TUW,0.874162772301967,18,84
spncC,zf,CTS,0.162796593453633,19,11
rBGTw,em,TUW,0.241233459679445,20,29
mJvgy,zf,TUW,0.202297121428576,21,30
bUYWn,zf,TUW,0.811831720899143,22,59
UZBnx,ac,HTC,0.932666389710838,23,8
MRBeX,mk,HTC,0.693594596855285,24,48
nQlkg,ac,HTC,0.401384856519051,25,8
vTpVO,zf,TUW,0.874445582514746,26,21
fIMit,mk,CTS,0.132249841803945,27,55
zdlIR,mk,TUW,0.707197508416099,28,75
iCYCf,mk,HTC,0.244308074942487,29,71
wrYNZ,zf,CTS,0.01801094733697,30,22
jkSgS,zf,TUW,0.447205828967223,31,73
VyiRd,ac,CTS,0.161027515015294,32,9
YhbbA,zf,HTC,0.83370011204063,33,94
gBDuy,zf,TUW,0.664052548082469,34,8
dhZIp,em,HTC,0.373916046137873,35,20
,em,TUW,0.646340834306219,36,88
aNmmb,zf,CTS,0.128130761807784,37,64
ESnnP,ac,TUW,0.934634405539849,38,49
hKuFb,em,CTS,0.565030562743735,39,54
GNjgn,zf,TUW,0.73633701117453,40,92
TINoa,ac,HTC,0.376780237998876,41,67
iYFLQ,em,TUW,0.25352661702033,42,82
lqyZg,zf,TUW,0.54250701622234,43,73
ZGKXs,mk,TUW,0.024641948389589,44,43
,ac,TUW,0.774817096166978,45,73
biNta,ac,TUW,0.557421872562752,46,51
,em,CTS,0.225340553902755,47,30
CvSLK,ac,HTC,0.009148864951826,48,29
HvYru,em,CTS,0.541796315903777,49,64
MnWaE,em,HTC,0.941490266522325,50,61
unique,method,company,measurements,id,trialn
qmlxQ,ac,TUW,0.119518945710839,1,11
ZVotj,em,TUW,0.579278502596286,2,10
ZZKxw,em,CTS,0.110421484888797,3,47
EtbEZ,mk,TUW,0.957680768542753,4,85
mIzFM,zf,CTS,0.560600410267153,5,21
BHGkA,ac,CTS,0.728916943837204,6,7
ykIJD,em,TUW,0.577940546563354,7,84
BIanA,mk,CTS,0.157122623837254,8,11
bpxfA,mk,HTC,0.162253909989652,9,16
DpPuP,mk,CTS,0.752363194012459,10,42
zNmKK,em,HTC,0.43496344834422,11,49
AlaUc,zf,CTS,0.057983945707968,12,46
LLYKq,mk,HTC,0.826291002242676,13,49
VEnTS,zf,TUW,0.481771619797996,14,28
SJZcT,zf,HTC,0.613951269147019,15,80
guIYg,zf,HTC,0.267130339290849,16,12
XNTZi,zf,HTC,0.000803017290364,17,31
KNuYX,zf,HTC,0.437614896982688,18,81
qmCNy,em,TUW,0.91368707552458,19,4
CqoQe,zf,TUW,0.185952559152628,20,87
hVjjj,mk,HTC,0.218515015781341,21,58
lKxvl,zf,HTC,0.575057030487427,22,82
BuNyt,mk,TUW,0.095936617831273,23,83
TxTLs,zf,TUW,0.341860997917044,24,31
egjBr,em,CTS,0.566091396670721,25,72
SkAKG,zf,CTS,0.705038778394861,26,72
rrsgS,em,CTS,0.27396431169605,27,35
MkvHK,mk,CTS,0.409384025104929,28,55
QrsSN,ac,TUW,0.309250854700332,29,32
bPaZn,mk,HTC,0.197598416103255,30,76
euHsT,em,TUW,0.244982476497172,31,1
YbEor,mk,HTC,0.059182229404412,32,73
fUIOS,em,TUW,0.068205534760352,33,29
YiYqH,mk,CTS,0.89529992692975,34,69
zKoQA,zf,TUW,0.109915822505327,35,84
VTsaW,zf,HTC,0.509669207006009,36,94
yxRXZ,mk,CTS,0.451574434565363,37,56
SCyRW,ac,CTS,0.124352315535646,38,92
tHtlR,ac,CTS,0.48899041695442,39,85
GQxJV,ac,CTS,0.068566261635729,40,31
DhrmI,mk,HTC,0.566841977776942,41,81
nXjZd,zf,TUW,0.269955877897457,42,90
mMPdi,zf,CTS,0.063296411747781,43,43
mlxCp,em,HTC,0.878984256089514,44,86
fsAAL,zf,TUW,0.636843138011562,45,65
YCpee,mk,HTC,0.759228020766237,46,45
NPFyA,mk,HTC,0.430894880146095,47,36
NaYec,zf,HTC,0.722680128749803,48,23
SKvUa,mk,HTC,0.646646671882556,49,43
ybZPA,ac,HTC,0.844059906854385,50,82
[
{
"conceptrecid": "926069",
"created": "2021-09-28T11:57:29.192687",
"id": 926070,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926070/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926070/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926070/files",
"html": "https://sandbox.zenodo.org/deposit/926070",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926070/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926070"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926070",
"recid": 926070
}
},
"modified": "2021-09-28T11:57:29.192695",
"owner": 93513,
"record_id": 926070,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926067",
"created": "2021-09-28T11:57:28.623909",
"id": 926068,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926068/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926068/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926068/files",
"html": "https://sandbox.zenodo.org/deposit/926068",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926068/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926068"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926068",
"recid": 926068
}
},
"modified": "2021-09-28T11:57:28.623921",
"owner": 93513,
"record_id": 926068,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926065",
"created": "2021-09-28T11:57:28.290904",
"id": 926066,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926066/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926066/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926066/files",
"html": "https://sandbox.zenodo.org/deposit/926066",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926066/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926066"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926066",
"recid": 926066
}
},
"modified": "2021-09-28T11:57:28.290916",
"owner": 93513,
"record_id": 926066,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926063",
"created": "2021-09-28T11:56:42.778546",
"id": 926064,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926064/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926064/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926064/files",
"html": "https://sandbox.zenodo.org/deposit/926064",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926064/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926064"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926064",
"recid": 926064
}
},
"modified": "2021-09-28T11:56:42.778554",
"owner": 93513,
"record_id": 926064,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926061",
"created": "2021-09-28T11:56:42.508336",
"id": 926062,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926062/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926062/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926062/files",
"html": "https://sandbox.zenodo.org/deposit/926062",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926062/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926062"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926062",
"recid": 926062
}
},
"modified": "2021-09-28T11:56:42.508345",
"owner": 93513,
"record_id": 926062,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926059",
"created": "2021-09-28T11:56:42.180232",
"id": 926060,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926060/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926060/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926060/files",
"html": "https://sandbox.zenodo.org/deposit/926060",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926060/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926060"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926060",
"recid": 926060
}
},
"modified": "2021-09-28T11:56:42.180258",
"owner": 93513,
"record_id": 926060,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926057",
"created": "2021-09-28T11:55:30.687174",
"id": 926058,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926058/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926058/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926058/files",
"html": "https://sandbox.zenodo.org/deposit/926058",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926058/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926058"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926058",
"recid": 926058
}
},
"modified": "2021-09-28T11:55:30.687182",
"owner": 93513,
"record_id": 926058,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926055",
"created": "2021-09-28T11:55:30.418595",
"id": 926056,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926056/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926056/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926056/files",
"html": "https://sandbox.zenodo.org/deposit/926056",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926056/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926056"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926056",
"recid": 926056
}
},
"modified": "2021-09-28T11:55:30.418608",
"owner": 93513,
"record_id": 926056,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926053",
"created": "2021-09-28T11:55:30.076856",
"id": 926054,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926054/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926054/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926054/files",
"html": "https://sandbox.zenodo.org/deposit/926054",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926054/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926054"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926054",
"recid": 926054
}
},
"modified": "2021-09-28T11:55:30.076870",
"owner": 93513,
"record_id": 926054,
"state": "unsubmitted",
"submitted": false,
"title": ""
},
{
"conceptrecid": "926051",
"created": "2021-09-28T11:54:52.201413",
"id": 926052,
"links": {
"discard": "https://sandbox.zenodo.org/api/deposit/depositions/926052/actions/discard",
"edit": "https://sandbox.zenodo.org/api/deposit/depositions/926052/actions/edit",
"files": "https://sandbox.zenodo.org/api/deposit/depositions/926052/files",
"html": "https://sandbox.zenodo.org/deposit/926052",
"publish": "https://sandbox.zenodo.org/api/deposit/depositions/926052/actions/publish",
"self": "https://sandbox.zenodo.org/api/deposit/depositions/926052"
},
"metadata": {
"prereserve_doi": {
"doi": "10.5072/zenodo.926052",
"recid": 926052
}
},
"modified": "2021-09-28T11:54:52.201426",
"owner": 93513,
"record_id": 926052,
"state": "unsubmitted",
"submitted": false,
"title": ""
}
]
\ No newline at end of file
package at.tuwien.config; package at.tuwien.config;
import at.tuwien.exception.ZenodoAuthenticationException;
import at.tuwien.utils.ZenodoTemplateInterceptor; import at.tuwien.utils.ZenodoTemplateInterceptor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import lombok.Getter; import lombok.Getter;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.DefaultUriTemplateHandler; import org.springframework.web.util.DefaultUriBuilderFactory;
import org.springframework.web.util.UriBuilderFactory;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.time.ZoneId;
import java.util.List; import java.util.List;
import java.util.TimeZone;
@Log4j2
@Configuration @Configuration
public class ZenodoConfig { public class ZenodoConfig {
...@@ -20,17 +30,33 @@ public class ZenodoConfig { ...@@ -20,17 +30,33 @@ public class ZenodoConfig {
@Value("${zenodo.endpoint}") @Value("${zenodo.endpoint}")
private String zenodoEndpoint; private String zenodoEndpoint;
@Getter
@NotNull @NotNull
@Value("${zenodo.api_key}") @Value("${zenodo.api_key}")
private String zenodoApiKey; private String apiKey;
public String getApiKey() throws ZenodoAuthenticationException {
if (apiKey == null || apiKey.isEmpty()) {
log.debug("api key is {}", apiKey);
throw new ZenodoAuthenticationException("Did not find a valid Zenodo API key in environment variable ZENODO_API_KEY");
}
return apiKey;
}
@Bean
public ObjectMapper objectMapper() {
return new ObjectMapper()
.findAndRegisterModules()
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
.setTimeZone(TimeZone.getTimeZone(ZoneId.of("Europe/Vienna")))
.registerModule(new JavaTimeModule())
.registerModule(new Jdk8Module());
}
@Bean @Bean
public RestTemplate zenodo() { public RestTemplate zenodo() {
DefaultUriTemplateHandler defaultUriTemplateHandler = new DefaultUriTemplateHandler(); final UriBuilderFactory factory = new DefaultUriBuilderFactory(zenodoEndpoint);
defaultUriTemplateHandler.setBaseUrl(zenodoEndpoint);
final RestTemplate template = new RestTemplateBuilder() final RestTemplate template = new RestTemplateBuilder()
.uriTemplateHandler(defaultUriTemplateHandler) .uriTemplateHandler(factory)
.build(); .build();
template.setInterceptors(List.of(new ZenodoTemplateInterceptor())); template.setInterceptors(List.of(new ZenodoTemplateInterceptor()));
return template; return template;
......
...@@ -9,7 +9,9 @@ import java.util.List; ...@@ -9,7 +9,9 @@ import java.util.List;
@Service @Service
public interface CitationService { public interface CitationService {
List<DepositDto> listStoredCitations() throws ZenodoAuthenticationException, ZenodoApiException; List<DepositDto> listCitations() throws ZenodoAuthenticationException, ZenodoApiException;
DepositDto storeCitation() throws ZenodoAuthenticationException, ZenodoApiException; DepositDto storeCitation() throws ZenodoAuthenticationException, ZenodoApiException;
DepositDto deleteCitation(Long id) throws ZenodoAuthenticationException, ZenodoApiException;
} }
...@@ -25,30 +25,47 @@ public class ZenodoService implements CitationService { ...@@ -25,30 +25,47 @@ public class ZenodoService implements CitationService {
} }
@Override @Override
public List<DepositDto> listStoredCitations() throws ZenodoAuthenticationException, ZenodoApiException { public List<DepositDto> listCitations() throws ZenodoAuthenticationException, ZenodoApiException {
final ResponseEntity<DepositDto[]> response = zenodoRestTemplate.exchange("/api/deposit/depositions?access_token={token}", final ResponseEntity<DepositDto[]> response = zenodoRestTemplate.exchange("/api/deposit/depositions?access_token={token}",
HttpMethod.GET, null, DepositDto[].class, zenodoConfig.getZenodoApiKey()); HttpMethod.GET, null, DepositDto[].class, zenodoConfig.getApiKey());
if (response.getStatusCode().is4xxClientError()) { if (response.getStatusCode().equals(HttpStatus.UNAUTHORIZED)) {
throw new ZenodoAuthenticationException("Token is missing or invalid."); throw new ZenodoAuthenticationException("Token is missing or invalid.");
} }
if (response.getBody() == null) { if (response.getBody() == null) {
throw new ZenodoApiException("Endpoint returned null body"); throw new ZenodoApiException("Endpoint returned null body");
} }
return Arrays.asList(response.getBody()); return Arrays.asList(response.getBody());
} }
@Override @Override
public DepositDto storeCitation() throws ZenodoAuthenticationException, ZenodoApiException { public DepositDto storeCitation() throws ZenodoAuthenticationException, ZenodoApiException {
final ResponseEntity<DepositDto> response = zenodoRestTemplate.exchange("/api/deposit/depositions?access_token={token}", final ResponseEntity<DepositDto> response = zenodoRestTemplate.exchange("/api/deposit/depositions?access_token={token}",
HttpMethod.POST, null, DepositDto.class, zenodoConfig.getZenodoApiKey()); HttpMethod.POST, new HttpEntity<>("{}"), DepositDto.class, zenodoConfig.getApiKey());
if (response.getStatusCode().is4xxClientError()) { if (response.getStatusCode().equals(HttpStatus.UNAUTHORIZED)) {
throw new ZenodoAuthenticationException("Token is missing or invalid."); throw new ZenodoAuthenticationException("Token is missing or invalid.");
} }
if (response.getBody() == null) { if (response.getBody() == null) {
throw new ZenodoApiException("Endpoint returned null body"); throw new ZenodoApiException("Endpoint returned null body");
} }
if (response.getBody().getState().equals("error")) {
throw new ZenodoApiException("Status returned error or is unknown");
}
return response.getBody();
}
@Override
public DepositDto deleteCitation(Long id) throws ZenodoAuthenticationException, ZenodoApiException {
final ResponseEntity<DepositDto> response = zenodoRestTemplate.exchange("/api/deposit/depositions/{deposit_id}?access_token={token}",
HttpMethod.POST, null, DepositDto.class, id, zenodoConfig.getApiKey());
if (response.getStatusCode().equals(HttpStatus.UNAUTHORIZED)) {
throw new ZenodoAuthenticationException("Token is missing or invalid.");
}
if (response.getBody() == null) {
throw new ZenodoApiException("Endpoint returned null body");
}
if (response.getBody().getState().equals("error")) {
throw new ZenodoApiException("Status returned error or is unknown");
}
return response.getBody(); return response.getBody();
} }
} }
...@@ -4,7 +4,6 @@ import org.springframework.http.HttpRequest; ...@@ -4,7 +4,6 @@ import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.ClientHttpResponse;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException; import java.io.IOException;
...@@ -15,9 +14,8 @@ public class ZenodoTemplateInterceptor implements ClientHttpRequestInterceptor { ...@@ -15,9 +14,8 @@ public class ZenodoTemplateInterceptor implements ClientHttpRequestInterceptor {
@Override @Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException { throws IOException {
ClientHttpResponse response = execution.execute(request, body); request.getHeaders().set("Content-Type", "application/json");
response.getHeaders().add("Content-Type", "application/json"); request.getHeaders().set("Accept", "application/json");
response.getHeaders().add("Accept", "application/json"); return execution.execute(request, body);
return response;
} }
} }
ZENODO_API_KEY=OjphEf9axmjOxPqe419sTkhlVKZKA335NH5OGw0g4DyRUSd0LMryNtjNWg7x
\ No newline at end of file
# DB Service API url
# GATEWAY SERVICE
API="http://localhost:9095"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment