-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
GRSciColl - use machineTags instead of identifiers for IH synch #342
Comments
This would also imply to move the IH machine tags when merging entities (now we only move the iDigBio machine tags) |
Yes the machine Tags will have to be carried over during merging. I guess this is a bit of a broader issue on this whole "Master data management solution": #319 |
commit 7bee27b Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Jun 3 17:25:20 2021 +0200 fixed bugs in merge and suggestions commit 7f59ce5 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Jun 3 15:41:47 2021 +0200 from field for grscicoll emails + error handling improved in country scopes commit b8e5a42 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Jun 3 13:18:12 2021 +0200 suggestion emails improvements + #334 commit 23224ed Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Jun 2 16:37:44 2021 +0200 fixed tests commit a3c66b9 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Jun 2 16:18:30 2021 +0200 fixed tests commit 33acef4 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Jun 2 14:31:39 2021 +0200 tests + adapted AuthPreCheckCreationRequestFilter commit 10bc0f1 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 15:45:44 2021 +0200 fixed tests commit fb1deb5 Merge: e362d27 95c9cc7 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 15:25:59 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit 95c9cc7 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 14:31:00 2021 +0200 SuggestedChangesTypeHandler null handling for change authors commit e362d27 Merge: f82c141 be9551c Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 13:44:10 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit be9551c Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 13:41:03 2021 +0200 change field stillRelevant renamed to outdated commit f82c141 Merge: 0d9b1cb 3213a6e Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 13:11:10 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit 3213a6e Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 13:09:37 2021 +0200 added name, country and changes for CREATE suggestions + urls emails commit 0d9b1cb Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 12:32:21 2021 +0200 permissions WIP commit 8816a36 Merge: 6b98a92 e81d948 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 09:45:17 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions # Conflicts: # registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java commit e81d948 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 09:39:00 2021 +0200 change suggestions improvements commit c29f8ad Merge: c008bdb cdb1358 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Jun 1 09:38:19 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # pom.xml commit 6b98a92 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Mon May 31 12:11:51 2021 +0200 permissions WIP commit 4e88724 Merge: 8b2a948 c008bdb Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 16:23:26 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit c008bdb Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 16:16:24 2021 +0200 removed country and name from the suggestions DB table commit 8b2a948 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 15:50:09 2021 +0200 changed condition in DuplicatesService to use IH machine tags commit a8ffa9d Merge: c0655e2 f6eac0b Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 14:01:26 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit f6eac0b Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 13:58:11 2021 +0200 updated gbif-api version commit f7eeb47 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 28 13:53:16 2021 +0200 added entityName and renamed country to entityCountry commit c0655e2 Merge: 62dfcf2 bbf751f Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 16:11:08 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit bbf751f Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 16:04:36 2021 +0200 NullToNotFound in suggestions commit 3275893 Merge: 7435dbc 266b4b5 Author: fmendezh <federicomh@gmail.com> Date: Thu May 27 15:45:44 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 7435dbc Merge: 500f2e2 c2d18fa Author: fmendezh <federicomh@gmail.com> Date: Thu May 27 14:58:06 2021 +0200 Merge branch '#343_suggest_change_and_log' of https://github.com/gbif/registry into #343_suggest_change_and_log commit 500f2e2 Merge: 4d786c3 34521cc Author: fmendezh <federicomh@gmail.com> Date: Thu May 27 14:57:59 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit c2d18fa Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 14:55:30 2021 +0200 get changeSuggestion commit f3794af Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 14:32:57 2021 +0200 hiding proposer email for users without rights to edit commit 4d786c3 Merge: 59a6290 00df497 Author: fmendezh <federicomh@gmail.com> Date: Thu May 27 14:20:57 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 62dfcf2 Merge: d7bd774 59a6290 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 12:54:18 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit 59a6290 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 12:49:03 2021 +0200 ignorning the field deleted in the suggestions commit 60f5e5f Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 12:38:42 2021 +0200 fixed changeSuggestion get commit 798aa81 Merge: 9504251 019e311 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 12:32:17 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java commit d7bd774 Merge: e614777 9504251 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 10:53:16 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit 9504251 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 10:49:22 2021 +0200 updated gbif-api version commit a9b9611 Merge: 1a9af98 b84da3d Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 10:46:59 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # pom.xml commit 1a9af98 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 27 10:46:28 2021 +0200 updated gbif-api version commit e614777 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 26 17:14:35 2021 +0200 added namespace and country rights commit 8fb60c9 Merge: 850a030 d048163 Author: fmendezh <federicomh@gmail.com> Date: Wed May 26 14:35:31 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 046d03e Merge: 22884cd 850a030 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 26 13:51:26 2021 +0200 Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions commit 850a030 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 26 13:49:00 2021 +0200 checks before deleting subentities commit ff97cf0 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 26 09:56:14 2021 +0200 Fix ITs commit 22884cd Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 26 09:56:14 2021 +0200 Fix ITs commit e2c80d6 Merge: 3d7938d 846dcce Author: fmendezh <federicomh@gmail.com> Date: Wed May 26 08:48:52 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 3d7938d Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 25 15:37:39 2021 +0200 #342 changes to use IH machine tags instead of identifiers commit 244bd3f Merge: be609ea 5da1175 Author: fmendezh <federicomh@gmail.com> Date: Tue May 25 15:00:35 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit be609ea Merge: ef02ec7 3c6acf5 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 25 13:42:36 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit ef02ec7 Merge: dfd7143 abf373a Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 25 13:04:14 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit dfd7143 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 21 17:13:53 2021 +0200 minor improvements commit 0f5ee85 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 21 16:47:55 2021 +0200 #355 subentities are not created when creating a grscicoll entity commit b6ea3d4 Merge: e4db80a f41f7b7 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 21 16:07:50 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java commit e4db80a Merge: 9041605 435bc66 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 21 09:31:10 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 9041605 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 16:07:24 2021 +0200 fixes commit d3e63ab Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 13:24:17 2021 +0200 using proposerEmail in the list method commit f502292 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 13:10:17 2021 +0200 audit log + change suggestions fixes commit 65385c6 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 10:25:09 2021 +0200 renamed proposerEmail to proposedBy commit 742ce5c Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 10:23:49 2021 +0200 renamed proposerEmail to proposedBy commit a461378 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 10:09:33 2021 +0200 renamed proposerEmail to proposedBy commit a91a3ab Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 20 09:57:03 2021 +0200 renamed proposerEmail to proposedBy commit 70d3877 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 17:18:02 2021 +0200 minor improvements commit 28f4280 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 15:41:01 2021 +0200 minor improvements commit 6161872 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 14:39:44 2021 +0200 fixed tests commit a6eb5be Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 14:09:39 2021 +0200 minor fixes commit 1f9187f Merge: e21b4bf d1c610a Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 10:08:05 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # pom.xml commit e21b4bf Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 19 10:07:08 2021 +0200 Audit log ITs + fixes commit 3399241 Merge: 236ed3a fea95bb Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Mon May 17 11:06:55 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # pom.xml # registry-ws/pom.xml commit 236ed3a Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Mon May 17 11:05:00 2021 +0200 fixed tests commit 6e888ad Merge: 3a4d1c0 3830c52 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 11 21:09:50 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 3a4d1c0 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 11 21:08:59 2021 +0200 audit log WIP commit 2096774 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 7 10:19:13 2021 +0200 ITs commit 1064e1b Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 7 10:15:20 2021 +0200 ITs commit a3b06d2 Merge: 32a98df 556f326 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Fri May 7 09:53:20 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 32a98df Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 6 17:06:15 2021 +0200 change suggestions emails + ITs commit 33c27f1 Merge: f609ad2 59fb185 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 6 17:05:44 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit f609ad2 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu May 6 10:34:12 2021 +0200 security change suggestions + email validation commit 1ea35d6 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 5 13:59:38 2021 +0200 added resource ITs for merging services commit b9526c6 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 5 13:18:53 2021 +0200 use of new interfaces for services commit c1b0baf Merge: 589d00b a3e6b82 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 5 10:36:16 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 589d00b Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed May 5 10:35:41 2021 +0200 spliting config in ITs commit 2eb6110 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 17:28:43 2021 +0200 IT for grscicoll duplicates commit 02aacf6 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 17:03:26 2021 +0200 PrimaryCollectionEntity + minor improvements commit b7964d9 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 16:24:01 2021 +0200 split ITs into service and resource tests (WIP) commit 7595f92 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 16:03:44 2021 +0200 merge dev commit 743ccb9 Merge: e47fac9 1f19447 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 16:02:38 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PrimaryCollectionEntityServiceIT.java # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java commit e47fac9 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue May 4 15:59:04 2021 +0200 split ITs into service and resource (WIP) commit 0c47799 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Mon May 3 12:12:24 2021 +0200 split ITs into service and resource (WIP) commit 0d8b7ad Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 29 17:46:33 2021 +0200 moved security to the service layer of collections commit 5f0d94a Merge: ff4f526 1c4ea2d Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 29 16:57:43 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit ff4f526 Merge: 49cb02c de459b9 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 29 16:14:53 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java commit 49cb02c Merge: 4e10530 6717f1f Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 29 13:01:45 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java # registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java commit 4e10530 Merge: f8b3b1b 710daf4 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Apr 28 19:14:48 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java commit f8b3b1b Merge: 1048791 0419758 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Apr 28 18:29:43 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log # Conflicts: # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/CollectionIT.java # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java # registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java commit 1048791 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Wed Apr 28 18:15:22 2021 +0200 added service layer for grscicoll + audit log (WIP) commit 0507876 Merge: 2b1d195 6c4501c Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Tue Apr 27 16:49:26 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 2b1d195 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 22 15:08:12 2021 +0200 GRSciColl suggestions: ignoring synthetic fields commit 332f7fb Merge: 73a7c67 bf90c11 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 22 14:04:17 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 73a7c67 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 22 14:04:05 2021 +0200 GRSciColl suggestions V1 commit 763a879 Merge: 0e69d1d 4c91b09 Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 22 12:54:45 2021 +0200 Merge branch 'dev' into #343_suggest_change_and_log commit 0e69d1d Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com> Date: Thu Apr 22 12:54:26 2021 +0200 GRSciColl suggestions V1
No description provided.
The text was updated successfully, but these errors were encountered: