Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Merge Stable to Master #648

Merged
merged 29 commits into from
Oct 15, 2020
Merged

Merge Stable to Master #648

merged 29 commits into from
Oct 15, 2020

Conversation

katrite
Copy link
Member

@katrite katrite commented Oct 15, 2020

No description provided.

tompulli and others added 29 commits August 12, 2020 09:16
- LightFileserializer made modifications to class variable
  so when two requests came almost at the same time the latter
  was using modified version of the variable. Fixed with deepcopy
- Changed app to use local Elasticsearch with tests since it is now
  working
- Correctly call elasticsearch when request comes to _mapping endpoint
- Tests can be run against local elasticsearch which reduces the
  population time
- Follow naming convention in refdata loader with non-internal
  functions
CSCFAIRMETA-710: [FIX] _mapping endpoint and ES in testcases
- These mostly concern test data, but should be updated still
- In merge_draft take preservation_state from draft cr
- Change metax-demo to metax.demo
…ot-save-changes

CSCFAIRMETA-704 [FIX] merge-draft-does-not-save-changes
…nal-error-when-draft-already-exists

CSCFAIRMETA-716: [FIX] create-draft-internal-error-when-draft-already…
-Add migration to change email and organization name
- Add check whether metadata_owner_org or metadata_provider_org exists
- Add ?keys=datasets|files and ?keysonly=bool
- Remove parameter ?detailed as it is the same as ?keys=files
- Add test for parameter ?keysonly
- Add support for leaving argument ?detailed
Add ?keysonly return input list except standalone files or datasets without files
- Refactor sql's
- Fix parameters 'request' and 'preferred_identifier'
…e-part-of-some-dataset

Cscfairmeta 636 return if files are part of some dataset
CSCFAIRMETA-647: [FIX] bug with almost simultaneous requests
* CSCFAIRMETA-647: [FIX] bug with almost simultaneous requests

- LightFileserializer made modifications to class variable
  so when two requests came almost at the same time the latter
  was using modified version of the variable. Fixed with deepcopy
- Changed app to use local Elasticsearch with tests since it is now
  working

* CSCFAIRMETA-710: [FIX] _mapping endpoint and ES in testcases

- Correctly call elasticsearch when request comes to _mapping endpoint
- Tests can be run against local elasticsearch which reduces the
  population time
- Follow naming convention in refdata loader with non-internal
  functions

* CSCFAIRMETA-710: [FIX] remove unnecessary variable

* CSCFAIRADM-337: [ADD] Update domain references (#631)

- These mostly concern test data, but should be updated still

* CSCFAIRMETA-704 [FIX] merge-draft-does-not-save-changes
- In merge_draft take preservation_state from draft cr

* CSCFAIRMETA-704-merge-draft-does-not-save-changes
- Change metax-demo to metax.demo

* CSCFAIRMETA-716: [FIX] create-draft-internal-error-when-draft-already-exists
- Add a check for next_draft

* CSCFAIRMETA-712-Issues-with-emails
-Add migration to change email and organization name

* CSCFAIRMETA-712-Issues-with-emails
- Add check whether metadata_owner_org or metadata_provider_org exists

* CSCFAIRMETA-636-return-if-files-are-part-of-some-dataset
- Add ?keys=datasets|files and ?keysonly=bool
- Remove parameter ?detailed as it is the same as ?keys=files

* CSCFAIRMETA-636-return-if-files-are-part-of-some-dataset
- Add test for parameter ?keysonly

* CSCFAIRMETA-636-return-if-files-are-part-of-some-dataset
- Add support for leaving argument ?detailed

* CSCFAIRMETA-636-return-if-files-are-part-of-some-dataset
Add ?keysonly return input list except standalone files or datasets without files

* CSCFAIRMETA-636-return-if-files-are-part-of-some-dataset
- Refactor sql's
- Fix parameters 'request' and 'preferred_identifier'

Co-authored-by: Tommi Pulli <[email protected]>
Co-authored-by: Tommi Pulli <[email protected]>
Co-authored-by: Mattias Levlin <[email protected]>
- Save old notation into own field
- Replace notation with new guid
- Add datasets folder into migrations
- Replace syke url for harvester
Merge test to stable
@katrite katrite requested a review from genie9 October 15, 2020 18:13
@katrite katrite requested a review from EarthModule October 15, 2020 18:13
@katrite katrite changed the title Stable Merge Stable to Master Oct 15, 2020
@katrite katrite merged commit a64bb2e into master Oct 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants