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
13
Issues
13
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
d35cd1e4
Commit
d35cd1e4
authored
Aug 06, 2018
by
Alexander Prendetskiy
Committed by
Matija Obreza
Aug 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move tileIndex to AccessionData
Signed-off-by:
Matija Obreza
<
matija.obreza@croptrust.org
>
parent
eb199dd3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
1 deletion
+48
-1
src/main/java/org/genesys2/server/model/genesys/Accession.java
...ain/java/org/genesys2/server/model/genesys/Accession.java
+2
-1
src/main/java/org/genesys2/server/model/genesys/AccessionData.java
...java/org/genesys2/server/model/genesys/AccessionData.java
+17
-0
src/main/resources/liquibase/liquibase-changeLog.yml
src/main/resources/liquibase/liquibase-changeLog.yml
+29
-0
No files found.
src/main/java/org/genesys2/server/model/genesys/Accession.java
View file @
d35cd1e4
...
...
@@ -42,7 +42,8 @@ import org.springframework.data.elasticsearch.annotations.Document;
@Index
(
name
=
"IX_origcty_seqNo"
,
columnList
=
"orgCtyId,seqNo"
),
@Index
(
name
=
"IX_taxa_seq"
,
columnList
=
"taxonomyId2,seqNo"
),
@Index
(
name
=
"IX_seqNo"
,
columnList
=
"seqNo"
),
@Index
(
name
=
"IX_accession_lastModifiedDate"
,
columnList
=
"lastModifiedDate"
)
})
@Index
(
name
=
"IX_accession_lastModifiedDate"
,
columnList
=
"lastModifiedDate"
),
@Index
(
unique
=
false
,
columnList
=
"tileIndex"
)})
@Audited
@Document
(
indexName
=
"genesys"
)
public
class
Accession
extends
AccessionData
{
...
...
src/main/java/org/genesys2/server/model/genesys/AccessionData.java
View file @
d35cd1e4
...
...
@@ -38,6 +38,7 @@ import org.genesys.blocks.model.AuditedVersionedModel;
import
org.genesys.blocks.model.IdUUID
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.worldclim.WorldClimUtil
;
import
org.genesys2.server.model.impl.Country
;
import
org.genesys2.server.model.impl.Crop
;
import
org.genesys2.server.model.impl.FaoInstitute
;
...
...
@@ -178,6 +179,8 @@ public abstract class AccessionData extends AuditedVersionedModel implements IdU
@Field
(
index
=
FieldIndex
.
not_analyzed
)
@JsonInclude
private
boolean
sgsv
;
private
Long
tileIndex
;
/**
* Update MCPD {@link #storageStr}
...
...
@@ -198,6 +201,12 @@ public abstract class AccessionData extends AuditedVersionedModel implements IdU
this
.
instituteCode
=
getInstitute
().
getCode
();
this
.
storageStr
=
MCPDUtil
.
toMcpdArray
(
accessionId
.
getStorage
());
this
.
duplSiteStr
=
MCPDUtil
.
toMcpdArray
(
accessionId
.
getDuplSite
());
AccessionGeo
geo
=
this
.
accessionId
.
getGeo
();
if
(
geo
!=
null
)
{
tileIndex
=
WorldClimUtil
.
getTileIndex
(
5
,
geo
.
getLongitude
(),
geo
.
getLatitude
());
}
}
public
FaoInstitute
getInstitute
()
{
...
...
@@ -344,6 +353,14 @@ public abstract class AccessionData extends AuditedVersionedModel implements IdU
this
.
accessionId
=
accessionId
;
}
public
Long
getTileIndex
()
{
return
tileIndex
;
}
public
void
setTileIndex
(
Long
tileIndex
)
{
this
.
tileIndex
=
tileIndex
;
}
@Override
@Transient
public
UUID
getUuid
()
{
...
...
src/main/resources/liquibase/liquibase-changeLog.yml
View file @
d35cd1e4
...
...
@@ -3710,3 +3710,32 @@ databaseChangeLog:
-
dropColumn
:
tableName
:
dataset
columnName
:
published
-
changeSet
:
id
:
1533210002102-1
author
:
aprendetskiy
changes
:
-
addColumn
:
tableName
:
accession
columns
:
-
column
:
name
:
tileIndex
type
:
BIGINT
-
sql
:
sql
:
>-
update accession a right join acce ac on ac.id = a.id right join accession_geo geo on geo.id = ac.geoId set a.tileIndex = geo.tileIndex;
-
createIndex
:
columns
:
-
column
:
name
:
tileIndex
indexName
:
UK_21geycvlx21bswf9t89s2r99n
tableName
:
accession
-
addColumn
:
tableName
:
accession_historic
columns
:
-
column
:
name
:
tileIndex
type
:
BIGINT
-
sql
:
sql
:
>-
update accession_historic ah right join acce ac on ac.id = ah.id right join accession_geo geo on geo.id = ac.geoId set ah.tileIndex = geo.tileIndex;
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