Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/paratoo #912

Merged
merged 5 commits into from
Feb 25, 2024
Merged

Feature/paratoo #912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7805c2
Adding git properties to build #823
chrisala Feb 16, 2024
afa1f4a
Added version info to surveyId #823
chrisala Feb 21, 2024
f1f2650
Fixed messages when syncing protocols #823
chrisala Feb 21, 2024
c33d603
Fixing version info #823
chrisala Feb 21, 2024
401ac4c
Added check for deleted protocols #823
chrisala Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing version info #823
  • Loading branch information
@chrisala
chrisala committed Feb 21, 2024
commit c33d60332d52a87b07f1277771fd36ecbb385264
2 changes: 1 addition & 1 deletion grails-app/services/au/org/ala/ecodata/MetadataService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ class MetadataService {
}

String getVersion() {
getGitProperty(BUILD_VERSION_PROPERTY)
getGitProperty(BUILD_VERSION_PROPERTY)
}

/** Returns a value from the gradle/spring boot generated build-info.properties */
Expand Down
3 changes: 2 additions & 1 deletion grails-app/services/au/org/ala/ecodata/ParatooService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ class ParatooService {
userId: userId,
projectId: projectId,
system: "MERIT",
version: metadataService.getBuildProperty(metadataService.getVersion())
version: metadataService.getVersion()
)
dataSet.orgMintedIdentifier = orgMintedIdentifier.encodeAsMintedCollectionId()
log.info "Minting identifier for Monitor collection: ${paratooCollectionId}: ${dataSet.orgMintedIdentifier}"
project.custom.dataSets << dataSet
Map result = projectService.update([custom:project.custom], projectId, false)

Expand Down
6 changes: 4 additions & 2 deletions src/main/groovy/au/org/ala/ecodata/paratoo/ParatooMintedIdentifier.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ class ParatooMintedIdentifier {
projectId: projectId,
protocolId: surveyId.protocol.id,
protocolVersion: surveyId.protocol.version,
system: system,
version: version
org_provenance: [
system: system,
version: version
]
]
String jsonString = (data as JSON).toString()
jsonString.encodeAsBase64()
Expand Down
Loading