From 7a313344cbddaca7bcb073b01a549bfe2a5c3852 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 15 Feb 2021 17:36:37 +0100 Subject: [PATCH 1/2] MAPBOX introduced district for US-Cities. So I used a German City instead --- .../schema/resolvers/users/location.spec.js | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 0c871b168..41b784249 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -30,46 +30,46 @@ const newlyCreatedNodesWithLocales = [ city: { id: expect.stringContaining('place'), type: 'place', - name: 'Hamburg', - nameEN: 'Hamburg', - nameDE: 'Hamburg', - namePT: 'Hamburg', - nameES: 'Hamburg', - nameFR: 'Hamburg', - nameIT: 'Hamburg', - nameRU: 'Хамбург', - nameNL: 'Hamburg', - namePL: 'Hamburg', - lng: -74.5763, - lat: 41.1534, + name: 'Welzheim', + nameEN: 'Welzheim', + nameDE: 'Welzheim', + namePT: 'Welzheim', + nameES: 'Welzheim', + nameFR: 'Welzheim', + nameIT: 'Welzheim', + nameRU: 'Вельцхайм', + nameNL: 'Welzheim', + namePL: 'Welzheim', + lng: 9.63444, + lat: 48.87472, }, state: { id: expect.stringContaining('region'), type: 'region', - name: 'New Jersey', - nameEN: 'New Jersey', - nameDE: 'New Jersey', - namePT: 'Nova Jérsia', - nameES: 'Nueva Jersey', - nameFR: 'New Jersey', - nameIT: 'New Jersey', - nameRU: 'Нью-Джерси', - nameNL: 'New Jersey', - namePL: 'New Jersey', + name: 'Baden-Württemberg', + nameDE: 'Baden-Württemberg', + nameEN: 'Baden-Württemberg', + nameES: 'Baden-Wurtemberg', + nameFR: 'Bade-Wurtemberg', + nameIT: 'Baden-Württemberg', + nameNL: 'Baden-Württemberg', + namePL: 'Badenia-Wirtembergia', + namePT: 'Baden-Württemberg', + nameRU: 'Баден-Вюртемберг', }, country: { id: expect.stringContaining('country'), type: 'country', - name: 'United States', - nameEN: 'United States', - nameDE: 'Vereinigte Staaten', - namePT: 'Estados Unidos', - nameES: 'Estados Unidos', - nameFR: 'États-Unis', - nameIT: "Stati Uniti d'America", - nameRU: 'Соединённые Штаты Америки', - nameNL: 'Verenigde Staten van Amerika', - namePL: 'Stany Zjednoczone', + name: 'Germany', + nameDE: 'Deutschland', + nameEN: 'Germany', + nameES: 'Alemania', + nameFR: 'Allemagne', + nameIT: 'Germania', + nameNL: 'Duitsland', + namePL: 'Niemcy', + namePT: 'Alemanha', + nameRU: 'Германия', }, }, ] @@ -170,7 +170,7 @@ describe('userMiddleware', () => { ...variables, id: 'updating-user', name: 'Updating user', - locationName: 'Hamburg, New Jersey, United States of America', + locationName: 'Welzheim, Baden-Württemberg, Germany', } await mutate({ mutation: updateUserMutation, variables }) const locations = await neode.cypher( From 063c730e5fb3e3ea363deb5adebdbf69589ec7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 15 Feb 2021 17:53:56 +0100 Subject: [PATCH 2/2] Fix 'db:migrate up' by moving examples outside of migrations folder --- .../20200123150105-merge_duplicate_user_accounts.js | 0 .../20200123150110-merge_duplicate_location_nodes.js | 0 ...e_muted_relationship_between_existing_blocked_relationships.js | 0 .../20200206190233-swap_latitude_with_longitude.js | 0 .../20200207080200-fulltext_index_for_tags.js | 0 .../20200213230248-add_unique_index_to_image_url.js | 0 .../20200312140328-bulk_upload_to_s3.js | 0 .../20200320200315-refactor_all_images_to_separate_type.js | 0 .../20200323140300-remove_deleted_users_obsolete_attributes.js | 0 .../20200323160336-remove_deleted_posts_obsolete_attributes.js | 0 .../20200326160326-remove_dangling_image_urls.js | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename backend/src/db/{migrations/examples => migrations-examples}/20200123150105-merge_duplicate_user_accounts.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200123150110-merge_duplicate_location_nodes.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200206190233-swap_latitude_with_longitude.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200207080200-fulltext_index_for_tags.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200213230248-add_unique_index_to_image_url.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200312140328-bulk_upload_to_s3.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200320200315-refactor_all_images_to_separate_type.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200323140300-remove_deleted_users_obsolete_attributes.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200323160336-remove_deleted_posts_obsolete_attributes.js (100%) rename backend/src/db/{migrations/examples => migrations-examples}/20200326160326-remove_dangling_image_urls.js (100%) diff --git a/backend/src/db/migrations/examples/20200123150105-merge_duplicate_user_accounts.js b/backend/src/db/migrations-examples/20200123150105-merge_duplicate_user_accounts.js similarity index 100% rename from backend/src/db/migrations/examples/20200123150105-merge_duplicate_user_accounts.js rename to backend/src/db/migrations-examples/20200123150105-merge_duplicate_user_accounts.js diff --git a/backend/src/db/migrations/examples/20200123150110-merge_duplicate_location_nodes.js b/backend/src/db/migrations-examples/20200123150110-merge_duplicate_location_nodes.js similarity index 100% rename from backend/src/db/migrations/examples/20200123150110-merge_duplicate_location_nodes.js rename to backend/src/db/migrations-examples/20200123150110-merge_duplicate_location_nodes.js diff --git a/backend/src/db/migrations/examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js b/backend/src/db/migrations-examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js similarity index 100% rename from backend/src/db/migrations/examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js rename to backend/src/db/migrations-examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js diff --git a/backend/src/db/migrations/examples/20200206190233-swap_latitude_with_longitude.js b/backend/src/db/migrations-examples/20200206190233-swap_latitude_with_longitude.js similarity index 100% rename from backend/src/db/migrations/examples/20200206190233-swap_latitude_with_longitude.js rename to backend/src/db/migrations-examples/20200206190233-swap_latitude_with_longitude.js diff --git a/backend/src/db/migrations/examples/20200207080200-fulltext_index_for_tags.js b/backend/src/db/migrations-examples/20200207080200-fulltext_index_for_tags.js similarity index 100% rename from backend/src/db/migrations/examples/20200207080200-fulltext_index_for_tags.js rename to backend/src/db/migrations-examples/20200207080200-fulltext_index_for_tags.js diff --git a/backend/src/db/migrations/examples/20200213230248-add_unique_index_to_image_url.js b/backend/src/db/migrations-examples/20200213230248-add_unique_index_to_image_url.js similarity index 100% rename from backend/src/db/migrations/examples/20200213230248-add_unique_index_to_image_url.js rename to backend/src/db/migrations-examples/20200213230248-add_unique_index_to_image_url.js diff --git a/backend/src/db/migrations/examples/20200312140328-bulk_upload_to_s3.js b/backend/src/db/migrations-examples/20200312140328-bulk_upload_to_s3.js similarity index 100% rename from backend/src/db/migrations/examples/20200312140328-bulk_upload_to_s3.js rename to backend/src/db/migrations-examples/20200312140328-bulk_upload_to_s3.js diff --git a/backend/src/db/migrations/examples/20200320200315-refactor_all_images_to_separate_type.js b/backend/src/db/migrations-examples/20200320200315-refactor_all_images_to_separate_type.js similarity index 100% rename from backend/src/db/migrations/examples/20200320200315-refactor_all_images_to_separate_type.js rename to backend/src/db/migrations-examples/20200320200315-refactor_all_images_to_separate_type.js diff --git a/backend/src/db/migrations/examples/20200323140300-remove_deleted_users_obsolete_attributes.js b/backend/src/db/migrations-examples/20200323140300-remove_deleted_users_obsolete_attributes.js similarity index 100% rename from backend/src/db/migrations/examples/20200323140300-remove_deleted_users_obsolete_attributes.js rename to backend/src/db/migrations-examples/20200323140300-remove_deleted_users_obsolete_attributes.js diff --git a/backend/src/db/migrations/examples/20200323160336-remove_deleted_posts_obsolete_attributes.js b/backend/src/db/migrations-examples/20200323160336-remove_deleted_posts_obsolete_attributes.js similarity index 100% rename from backend/src/db/migrations/examples/20200323160336-remove_deleted_posts_obsolete_attributes.js rename to backend/src/db/migrations-examples/20200323160336-remove_deleted_posts_obsolete_attributes.js diff --git a/backend/src/db/migrations/examples/20200326160326-remove_dangling_image_urls.js b/backend/src/db/migrations-examples/20200326160326-remove_dangling_image_urls.js similarity index 100% rename from backend/src/db/migrations/examples/20200326160326-remove_dangling_image_urls.js rename to backend/src/db/migrations-examples/20200326160326-remove_dangling_image_urls.js