From 32feeb06a00cce8a86df06b34065dd58b3bd8a4e Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 4 Sep 2025 16:43:02 +0200 Subject: [PATCH] BACKEND: Introduce `AzureMapsController` for managing Azure Maps configuration with Entra ID integration; add endpoints for configuration retrieval, health checks, and role-based permissions; enhance country dataset in `alldata.sql` with names for better clarity. --- pom.xml | 4 + src/frontend/src/assets/flags/BQ.svg | 18 + .../src/components/UI/AzureMapsComponent.vue | 346 ++++++++++++ .../layout/config/CountryProperties.vue | 218 +++++++- .../components/layout/config/Properties.vue | 97 +++- .../components/layout/edit/SupplierView.vue | 6 +- src/frontend/src/store/country.js | 64 ++- src/frontend/src/store/propertySets.js | 13 +- .../de/avatic/lcc/config/AzureMapsConfig.java | 39 ++ .../controller/maps/AzureMapsController.java | 219 ++++++++ .../de/avatic/lcc/model/country/Country.java | 11 + .../country/CountryRepository.java | 19 +- .../pagination/SearchQueryResult.java | 2 +- .../lcc/service/access/CountryService.java | 5 +- .../generic/CountryTransformer.java | 2 +- src/main/resources/application.properties | 4 + .../resources/master_data/01-properties.sql | 12 - src/main/resources/master_data/02-country.sql | 523 +++++++++--------- src/main/resources/schema.sql | 1 + src/test/resources/master_data/alldata.sql | 502 ++++++++--------- 20 files changed, 1518 insertions(+), 587 deletions(-) create mode 100644 src/frontend/src/assets/flags/BQ.svg create mode 100644 src/frontend/src/components/UI/AzureMapsComponent.vue create mode 100644 src/main/java/de/avatic/lcc/config/AzureMapsConfig.java create mode 100644 src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java diff --git a/pom.xml b/pom.xml index 6d96570..d0d3f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,10 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.boot + spring-boot-starter-cache + org.jetbrains annotations diff --git a/src/frontend/src/assets/flags/BQ.svg b/src/frontend/src/assets/flags/BQ.svg new file mode 100644 index 0000000..89b8e1c --- /dev/null +++ b/src/frontend/src/assets/flags/BQ.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/src/components/UI/AzureMapsComponent.vue b/src/frontend/src/components/UI/AzureMapsComponent.vue new file mode 100644 index 0000000..1adcec3 --- /dev/null +++ b/src/frontend/src/components/UI/AzureMapsComponent.vue @@ -0,0 +1,346 @@ + + + + + \ No newline at end of file diff --git a/src/frontend/src/components/layout/config/CountryProperties.vue b/src/frontend/src/components/layout/config/CountryProperties.vue index cd35639..a68ded1 100644 --- a/src/frontend/src/components/layout/config/CountryProperties.vue +++ b/src/frontend/src/components/layout/config/CountryProperties.vue @@ -1,15 +1,139 @@ @@ -17,4 +141,92 @@ export default { \ No newline at end of file diff --git a/src/frontend/src/components/layout/config/Properties.vue b/src/frontend/src/components/layout/config/Properties.vue index fe155e2..14aa3fa 100644 --- a/src/frontend/src/components/layout/config/Properties.vue +++ b/src/frontend/src/components/layout/config/Properties.vue @@ -1,18 +1,20 @@ \ No newline at end of file diff --git a/src/frontend/src/components/layout/edit/SupplierView.vue b/src/frontend/src/components/layout/edit/SupplierView.vue index a9744c9..82b317f 100644 --- a/src/frontend/src/components/layout/edit/SupplierView.vue +++ b/src/frontend/src/components/layout/edit/SupplierView.vue @@ -16,8 +16,7 @@
{{ coordinatesDMS }}
- map +
@@ -38,10 +37,11 @@ import {PhUser} from "@phosphor-icons/vue"; import ModalDialog from "@/components/UI/ModalDialog.vue"; import SelectNode from "@/components/layout/node/SelectNode.vue"; import Modal from "@/components/UI/Modal.vue"; +import AzureMapsComponent from "@/components/UI/AzureMapsComponent.vue"; export default { name: "SupplierView", - components: {Modal, SelectNode, ModalDialog, PhUser, Flag, InputField, IconButton}, + components: {AzureMapsComponent, Modal, SelectNode, ModalDialog, PhUser, Flag, InputField, IconButton}, emits: ['updateSupplier'], props: { supplierName: { diff --git a/src/frontend/src/store/country.js b/src/frontend/src/store/country.js index 7eef118..ba9809f 100644 --- a/src/frontend/src/store/country.js +++ b/src/frontend/src/store/country.js @@ -2,25 +2,33 @@ import {defineStore} from 'pinia' import {config} from '@/config' import {useErrorStore} from "@/store/error.js"; import {useStageStore} from "@/store/stage.js"; +import {usePropertySetsStore} from "@/store/propertySets.js"; -export const useCountryStore = defineStore('countryStore', { +export const useCountryStore = defineStore('country', { state() { return { + countries: null, properties: null, - periods: null, - loadedPeriod: null, loading: false, + query: null, + selectedCountryId: null, + selectedPeriodId: null, + countryDetail: null, } }, getters: { + getCountries(state) { + return state.countries; + }, + getSelectedCountry(state) { + return state.countryDetail; + } }, actions: { async setProperty(property) { if(this.properties === null) return; - console.log(property) - const prop = this.properties.find(p => p.external_mapping_id === property.id); if((prop ?? null) === null) return; @@ -31,33 +39,43 @@ export const useCountryStore = defineStore('countryStore', { await this.performRequest('PUT', url, body, false); prop.draft_value = property.reset ? null : property.value; - }, - async reload() { - await this.loadPeriods(); - await this.loadCountries(); - - const stage = useStageStore(); - await stage.checkStagedChanges(); + async selectPeriod(periodId) { + this.selectedPeriodId = periodId; + await this.loadCountryDetail(); }, - async loadPeriods() { - this.loading = true; - const url = `${config.backendUrl}/properties/periods`; - this.periods = await this.performRequest('GET', url, null); - this.loading = false; + async selectCountry(countryId) { + this.selectedCountryId = countryId; + await this.loadCountryDetail(); }, - async loadCountries(period = null) { + async loadCountryDetail() { + if(this.selectedCountryId == null) return; this.loading = true; const params = new URLSearchParams(); - if (period !== null) - params.append('property_set', period); - const url = `${config.backendUrl}/countries/all/${params.size === 0 ? '' : '?'}${params.toString()}`; - this.properties = await this.performRequest('GET', url, null); - this.loadedPeriod = period; + if(this.selectedPeriodId !== null) + params.append('property_set', this.selectedPeriodId); + + const url = `${config.backendUrl}/countries/${this.selectedCountryId}/${params.size === 0 ? '' : '?'}${params.toString()}`; + this.countryDetail = await this.performRequest('GET', url, null); this.loading = false; }, + async setQuery(query) { + this.query = query; + await this.fetchCountryList(); + }, + async reload() { + const stage = useStageStore(); + await stage.checkStagedChanges(); + }, + async fetchCountryList() { + const params = new URLSearchParams(); + if (this.query !== null) + params.append('filter', this.query); + const url = `${config.backendUrl}/countries/all/${params.size === 0 ? '' : '?'}${params.toString()}`; + this.countries = await this.performRequest('GET', url, null); + }, async performRequest(method, url, body, expectResponse = true) { const params = { diff --git a/src/frontend/src/store/propertySets.js b/src/frontend/src/store/propertySets.js index 09da9e5..95eea26 100644 --- a/src/frontend/src/store/propertySets.js +++ b/src/frontend/src/store/propertySets.js @@ -7,6 +7,7 @@ export const usePropertySetsStore = defineStore('propertySets', { state() { return { periods: null, + selectedPeriod: null, } }, getters: { @@ -27,6 +28,9 @@ export const usePropertySetsStore = defineStore('propertySets', { return period.id; } }, + getSelectedPeriod(state) { + return state.selectedPeriod; + }, getPeriodState(state) { return function(periodId) { if (state.periods === null) @@ -37,10 +41,12 @@ export const usePropertySetsStore = defineStore('propertySets', { } }, actions: { - async invalidate(periodId) { + setSelectedPeriod(periodId) { + this.selectedPeriod = periodId; + }, + async invalidate() { - - const url = `${config.backendUrl}/properties/periods/${periodId}/`; + const url = `${config.backendUrl}/properties/periods/${this.getSelectedPeriod}/`; this.periods = await this.performRequest('DELETE', url, null, false); await this.reload(); @@ -50,6 +56,7 @@ export const usePropertySetsStore = defineStore('propertySets', { this.loading = true; const url = `${config.backendUrl}/properties/periods`; this.periods = await this.performRequest('GET', url, null, ); + this.selectedPeriod = this.getCurrentPeriodId; this.loading = false; }, async performRequest(method, url, body, expectResponse = true) { diff --git a/src/main/java/de/avatic/lcc/config/AzureMapsConfig.java b/src/main/java/de/avatic/lcc/config/AzureMapsConfig.java new file mode 100644 index 0000000..e82c7f8 --- /dev/null +++ b/src/main/java/de/avatic/lcc/config/AzureMapsConfig.java @@ -0,0 +1,39 @@ +package de.avatic.lcc.config; + +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; + +import java.time.Duration; + +/** + * Konfiguration für Azure Maps Integration + */ +@Configuration +@EnableCaching +public class AzureMapsConfig { + + /** + * RestTemplate Bean für HTTP-Requests + */ + @Bean + public RestTemplate restTemplate(RestTemplateBuilder builder) { + return builder + .connectTimeout(Duration.ofSeconds(10)) + .readTimeout(Duration.ofSeconds(30)) + .build(); + } + + /** + * Cache Manager für Token-Caching + * Tokens werden für 50 Minuten gecacht (Azure Maps Tokens sind 60 Min gültig) + */ + @Bean + public CacheManager cacheManager() { + return new ConcurrentMapCacheManager("azureMapsTokens"); + } +} \ No newline at end of file diff --git a/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java b/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java new file mode 100644 index 0000000..7ee7c42 --- /dev/null +++ b/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java @@ -0,0 +1,219 @@ +package de.avatic.lcc.controller.maps; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.Instant; + +/** + * REST Controller für Azure Maps mit Entra ID Integration + */ +@RestController +@RequestMapping("/api/maps") +@CrossOrigin(origins = {"http://localhost:3000", "http://localhost:8080", "https://yourdomain.com"}) +public class AzureMapsController { + + private static final Logger logger = LoggerFactory.getLogger(AzureMapsController.class); + + @Value("${azure.maps.client.id}") + private String azureMapsClientId; + + @Value("${azure.maps.resource.id:}") + private String azureMapsResourceId; + + /** + * Endpoint zum Abrufen der Azure Maps Konfiguration + * Nur authentifizierte Benutzer können diese Konfiguration abrufen + * + * @return ConfigResponse mit Client ID und anderen Konfigurationsdaten + */ + @GetMapping("/config") + @PreAuthorize("hasAuthority('SCOPE_https://yourdomain.com/api.read')") // Anpassen an Ihre API-Scopes + public ResponseEntity getConfig() { + try { + logger.debug("Providing Azure Maps configuration for authenticated user"); + + if (azureMapsClientId == null || azureMapsClientId.trim().isEmpty()) { + logger.error("Azure Maps Client ID is null or empty - check application.properties"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Azure Maps Client ID not configured")); + } + + ConfigResponse response = new ConfigResponse( + azureMapsClientId.trim(), + azureMapsResourceId != null ? azureMapsResourceId.trim() : null + ); + + logger.debug("Successfully providing Azure Maps configuration"); + return ResponseEntity.ok(response); + + } catch (Exception e) { + logger.error("Error providing Azure Maps configuration: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Internal server error: " + e.getMessage())); + } + } + + /** + * Health Check Endpoint für Azure Maps Integration + * Öffentlich zugänglich für Monitoring + * + * @return Status der Azure Maps Konfiguration + */ + @GetMapping("/health") + public ResponseEntity healthCheck() { + try { + boolean isConfigured = azureMapsClientId != null && !azureMapsClientId.trim().isEmpty(); + + if (isConfigured) { + return ResponseEntity.ok(new HealthResponse("Azure Maps Entra ID configuration is valid", true)); + } else { + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE) + .body(new HealthResponse("Azure Maps Client ID is not configured", false)); + } + + } catch (Exception e) { + logger.error("Health check failed", e); + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE) + .body(new HealthResponse("Azure Maps service is unavailable", false)); + } + } + + /** + * Endpoint für rollenbasierte Zugriffskontrolle + * Prüft ob der Benutzer Azure Maps verwenden darf + */ + @GetMapping("/permissions") + @PreAuthorize("hasAuthority('SCOPE_https://yourdomain.com/api.read')") + public ResponseEntity checkPermissions() { + try { + // Hier können Sie zusätzliche Berechtigungsprüfungen implementieren + // z.B. basierend auf Benutzerrolle, Gruppe, etc. + + PermissionResponse response = new PermissionResponse( + true, // canUseAzureMaps + true, // canCreateMarkers + true // canModifyMarkers + ); + + return ResponseEntity.ok(response); + + } catch (Exception e) { + logger.error("Error checking permissions: {}", e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Error checking permissions: " + e.getMessage())); + } + } + + /** + * Response-Klasse für Konfiguration + */ + public static class ConfigResponse { + private final String clientId; + private final String resourceId; + private final long timestamp; + + public ConfigResponse(String clientId, String resourceId) { + this.clientId = clientId; + this.resourceId = resourceId; + this.timestamp = Instant.now().toEpochMilli(); + } + + public String getClientId() { + return clientId; + } + + public String getResourceId() { + return resourceId; + } + + public long getTimestamp() { + return timestamp; + } + } + + /** + * Response-Klasse für Berechtigungen + */ + public static class PermissionResponse { + private final boolean canUseAzureMaps; + private final boolean canCreateMarkers; + private final boolean canModifyMarkers; + private final long timestamp; + + public PermissionResponse(boolean canUseAzureMaps, boolean canCreateMarkers, boolean canModifyMarkers) { + this.canUseAzureMaps = canUseAzureMaps; + this.canCreateMarkers = canCreateMarkers; + this.canModifyMarkers = canModifyMarkers; + this.timestamp = Instant.now().toEpochMilli(); + } + + public boolean isCanUseAzureMaps() { + return canUseAzureMaps; + } + + public boolean isCanCreateMarkers() { + return canCreateMarkers; + } + + public boolean isCanModifyMarkers() { + return canModifyMarkers; + } + + public long getTimestamp() { + return timestamp; + } + } + + /** + * Response-Klasse für Fehler-Antworten + */ + public static class ErrorResponse { + private final String error; + private final long timestamp; + + public ErrorResponse(String error) { + this.error = error; + this.timestamp = Instant.now().toEpochMilli(); + } + + public String getError() { + return error; + } + + public long getTimestamp() { + return timestamp; + } + } + + /** + * Response-Klasse für Health Check + */ + public static class HealthResponse { + private final String message; + private final boolean healthy; + private final long timestamp; + + public HealthResponse(String message, boolean healthy) { + this.message = message; + this.healthy = healthy; + this.timestamp = Instant.now().toEpochMilli(); + } + + public String getMessage() { + return message; + } + + public boolean isHealthy() { + return healthy; + } + + public long getTimestamp() { + return timestamp; + } + } +} \ No newline at end of file diff --git a/src/main/java/de/avatic/lcc/model/country/Country.java b/src/main/java/de/avatic/lcc/model/country/Country.java index 6ac98be..40732d3 100644 --- a/src/main/java/de/avatic/lcc/model/country/Country.java +++ b/src/main/java/de/avatic/lcc/model/country/Country.java @@ -19,6 +19,9 @@ public class Country { @Size(max=5) private RegionCode regionCode; + @NotNull + @Size(max=255) + private String name; @NotNull private Boolean isDeprecated; @@ -54,4 +57,12 @@ public class Country { public void setDeprecated(Boolean deprecated) { isDeprecated = deprecated; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/src/main/java/de/avatic/lcc/repositories/country/CountryRepository.java b/src/main/java/de/avatic/lcc/repositories/country/CountryRepository.java index 7aee819..2f21504 100644 --- a/src/main/java/de/avatic/lcc/repositories/country/CountryRepository.java +++ b/src/main/java/de/avatic/lcc/repositories/country/CountryRepository.java @@ -29,7 +29,7 @@ public class CountryRepository { public Optional getById(Integer id) { String query = """ - SELECT country.id AS id, country.iso_code AS iso_code, country.region_code AS region_code, country.is_deprecated AS is_deprecated + SELECT country.id AS id, country.iso_code AS iso_code, country.region_code AS region_code, country.name AS name, country.is_deprecated AS is_deprecated FROM country WHERE country.id = ? """; @@ -47,7 +47,7 @@ public class CountryRepository { public Optional getByIsoCode(IsoCode isoCode) { String query = """ - SELECT country.id AS id, country.iso_code AS iso_code, country.region_code AS region_code, country.is_deprecated AS is_deprecated + SELECT country.id AS id, country.iso_code AS iso_code, country.region_code AS region_code, country.is_deprecated AS is_deprecated, country.name AS name FROM country WHERE country.iso_code = ? """; @@ -67,14 +67,14 @@ public class CountryRepository { var countries = filter.isPresent() ? jdbcTemplate.query(query, new CountryMapper(), - "%" + filter.get() + "%", "%" + filter.get() + "%", pagination.getLimit(), pagination.getOffset()) : + "%" + filter.get() + "%", "%" + filter.get() + "%", "%" + filter.get() + "%", pagination.getLimit(), pagination.getOffset()) : jdbcTemplate.query(query, new CountryMapper() , pagination.getLimit(), pagination.getOffset()); Integer totalCount = filter.isPresent() ? jdbcTemplate.queryForObject( buildCountQuery(filter.get(), excludeDeprecated), - Integer.class, "%" + filter.get() + "%", "%" + filter.get() + "%" + Integer.class, "%" + filter.get() + "%", "%" + filter.get() + "%", "%" + filter.get() + "%" ) : jdbcTemplate.queryForObject( buildCountQuery(null, excludeDeprecated), @@ -89,12 +89,12 @@ public class CountryRepository { String query = buildQuery(filter.orElse(null), excludeDeprecated, false); var countries = filter.map(f -> jdbcTemplate.query(query, new CountryMapper(), - "%" + f + "%", "%" + f + "%")) + "%" + f + "%", "%" + f + "%", "%" + f + "%")) .orElseGet(() -> jdbcTemplate.query(query, new CountryMapper())); Integer totalCount = filter.map(f -> jdbcTemplate.queryForObject( buildCountQuery(f, excludeDeprecated), - Integer.class, "%" + f + "%", "%" + f + "%")) + Integer.class, "%" + f + "%", "%" + f + "%", "%" + f + "%")) .orElseGet(() -> jdbcTemplate.queryForObject( buildCountQuery(null, excludeDeprecated), Integer.class)); @@ -111,7 +111,7 @@ public class CountryRepository { queryBuilder.append(" AND is_deprecated = FALSE"); } if (filter != null) { - queryBuilder.append(" AND (iso_code LIKE ? OR region_code LIKE ?) "); + queryBuilder.append(" AND (iso_code LIKE ? OR region_code LIKE ? or name LIKE ?) "); } return queryBuilder.toString(); @@ -119,14 +119,14 @@ public class CountryRepository { private String buildQuery(String filter, boolean excludeDeprecated, boolean hasLimit) { StringBuilder queryBuilder = new StringBuilder(""" - SELECT id, iso_code, region_code, is_deprecated + SELECT id, iso_code, region_code, is_deprecated, name FROM country WHERE 1=1"""); if (excludeDeprecated) { queryBuilder.append(" AND is_deprecated = FALSE "); } if (filter != null) { - queryBuilder.append(" AND (iso_code LIKE ? OR region_code LIKE ?) "); + queryBuilder.append(" AND (iso_code LIKE ? OR region_code LIKE ? OR name LIKE ?) "); } if (hasLimit) { queryBuilder.append(" ORDER BY iso_code LIMIT ? OFFSET ? "); @@ -151,6 +151,7 @@ public class CountryRepository { entity.setIsoCode(IsoCode.valueOf(rs.getString("iso_code"))); entity.setRegionCode(RegionCode.valueOf(rs.getString("region_code"))); entity.setDeprecated(rs.getBoolean("is_deprecated")); + entity.setName(rs.getString("name")); return entity; } diff --git a/src/main/java/de/avatic/lcc/repositories/pagination/SearchQueryResult.java b/src/main/java/de/avatic/lcc/repositories/pagination/SearchQueryResult.java index 43cc7dd..1070b6e 100644 --- a/src/main/java/de/avatic/lcc/repositories/pagination/SearchQueryResult.java +++ b/src/main/java/de/avatic/lcc/repositories/pagination/SearchQueryResult.java @@ -29,7 +29,7 @@ public class SearchQueryResult { public SearchQueryResult(List result, Integer page, Integer totalElements, Integer elementsPerPage) { this.result = result; this.page = page; - this.totalPages = totalElements/elementsPerPage + (totalElements%elementsPerPage == 0 ? 0 : 1); + this.totalPages = elementsPerPage == 0 ? 0 : (totalElements/elementsPerPage + (totalElements%elementsPerPage == 0 ? 0 : 1)); this.totalElements = totalElements; this.elementsPerPage = elementsPerPage; } diff --git a/src/main/java/de/avatic/lcc/service/access/CountryService.java b/src/main/java/de/avatic/lcc/service/access/CountryService.java index 3f5de46..cddf692 100644 --- a/src/main/java/de/avatic/lcc/service/access/CountryService.java +++ b/src/main/java/de/avatic/lcc/service/access/CountryService.java @@ -5,6 +5,7 @@ import de.avatic.lcc.dto.generic.CountryDTO; import de.avatic.lcc.model.country.Country; import de.avatic.lcc.model.country.IsoCode; import de.avatic.lcc.model.properties.CountryPropertyMappingId; +import de.avatic.lcc.model.rates.ValidityPeriodState; import de.avatic.lcc.repositories.country.CountryPropertyRepository; import de.avatic.lcc.repositories.country.CountryRepository; import de.avatic.lcc.repositories.pagination.SearchQueryPagination; @@ -143,7 +144,9 @@ public class CountryService { dto.setName(entity.getIsoCode().getFullName()); dto.setId(entity.getId()); - if (0 == propertySetId) { + var state = propertySetId != 0 ? propertySetRepository.getState(propertySetId) : null; + + if (0 == propertySetId || (state != ValidityPeriodState.EXPIRED && state != ValidityPeriodState.INVALID)) { var props = countryPropertyRepository.listPropertiesByCountryId(entity.getId()); if (props.isEmpty()) diff --git a/src/main/java/de/avatic/lcc/service/transformer/generic/CountryTransformer.java b/src/main/java/de/avatic/lcc/service/transformer/generic/CountryTransformer.java index d7f68a7..51d58a3 100644 --- a/src/main/java/de/avatic/lcc/service/transformer/generic/CountryTransformer.java +++ b/src/main/java/de/avatic/lcc/service/transformer/generic/CountryTransformer.java @@ -13,7 +13,7 @@ public class CountryTransformer { dto.setIsoCode(entity.getIsoCode().getCode()); dto.setRegionCode(entity.getRegionCode().getCode()); - dto.setName(entity.getIsoCode().getFullName()); + dto.setName(entity.getName()); dto.setId(entity.getId()); return dto; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 43b72f9..f60fde8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,3 +8,7 @@ spring.sql.init.mode=never #spring.profiles.active=setup lcc.bulk.sheet_password=secretSheet?! lcc.allowed_cors=${ALLOWED_CORS_DOMAIN} +azure.maps.subscription.key=${AZURE_MAPS_SUBSCRIPTION_KEY} +azure.maps.client.id=your-app-registration-client-id +azure.maps.resource.id=/subscriptions/sub-id/resourceGroups/rg-name/providers/Microsoft.Maps/accounts/account-name + diff --git a/src/main/resources/master_data/01-properties.sql b/src/main/resources/master_data/01-properties.sql index a2fa703..7195a7e 100644 --- a/src/main/resources/master_data/01-properties.sql +++ b/src/main/resources/master_data/01-properties.sql @@ -254,18 +254,6 @@ VALUES ( '0.7' ); -INSERT INTO system_property (property_set_id, system_property_type_id, property_value) -VALUES ( - (SELECT ps.id FROM `property_set` ps - WHERE ps.state = 'VALID' - AND ps.start_date <= NOW() - AND (ps.end_date IS NULL OR ps.end_date > NOW()) - ORDER BY ps.start_date DESC - LIMIT 1), - (SELECT spt.id FROM system_property_type spt WHERE spt.external_mapping_id = 'TRUCK_UTIL'), - '0.7' - ); - INSERT INTO system_property (property_set_id, system_property_type_id, property_value) VALUES ( (SELECT ps.id FROM `property_set` ps diff --git a/src/main/resources/master_data/02-country.sql b/src/main/resources/master_data/02-country.sql index 69637fd..7460ab9 100644 --- a/src/main/resources/master_data/02-country.sql +++ b/src/main/resources/master_data/02-country.sql @@ -24,266 +24,266 @@ WHERE NOT EXISTS ( INSERT INTO `country_property_type` (`name`, `external_mapping_id`, `data_type`, `validation_rule`, `is_required`) VALUES - ('Customs Union', 'UNION', 'TEXT', NULL, FALSE), - ('Safety Stock [working days]', 'SAFETY_STOCK', 'INT', 'CHECK (CAST(property_value AS UNSIGNED) >= 0)', FALSE), - ('Air Freight Share [%]', 'AIR_SHARE', 'PERCENTAGE', 'CHECK (property_value REGEXP "^[0-9]+%$")', FALSE), - ('Wage Factor [%]', 'WAGE', 'PERCENTAGE', 'CHECK (property_value REGEXP "^[0-9]+%$")', FALSE); + ('Customs Union', 'UNION', 'ENUMERATION', '{ "ENUM" : ["EU", "NONE"]}', FALSE), + ('Safety Stock [working days]', 'SAFETY_STOCK', 'INT', '{"GTE": 0}', FALSE), + ('Air Freight Share [%]', 'AIR_SHARE', 'PERCENTAGE', '{"GTE": 0}', FALSE), + ('Wage Factor [%]', 'WAGE', 'PERCENTAGE', '{"GT": 0}', FALSE); -- ============================================================================= -- 2. INSERT COUNTRIES -- ============================================================================= -INSERT INTO `country` (`iso_code`, `region_code`, `is_deprecated`) VALUES - ('AD', 'EMEA', FALSE), - ('AE', 'EMEA', FALSE), - ('AF', 'EMEA', FALSE), - ('AG', 'LATAM', FALSE), - ('AI', 'LATAM', FALSE), - ('AL', 'EMEA', FALSE), - ('AM', 'EMEA', FALSE), - ('AO', 'EMEA', FALSE), - ('AQ', 'EMEA', FALSE), - ('AR', 'LATAM', FALSE), - ('AS', 'APAC', FALSE), - ('AT', 'EMEA', FALSE), - ('AU', 'APAC', FALSE), - ('AW', 'LATAM', FALSE), - ('AX', 'EMEA', FALSE), - ('AZ', 'EMEA', FALSE), - ('BA', 'EMEA', FALSE), - ('BB', 'LATAM', FALSE), - ('BD', 'EMEA', FALSE), - ('BE', 'EMEA', FALSE), - ('BF', 'EMEA', FALSE), - ('BG', 'EMEA', FALSE), - ('BH', 'EMEA', FALSE), - ('BI', 'EMEA', FALSE), - ('BJ', 'EMEA', FALSE), - ('BL', 'LATAM', FALSE), - ('BM', 'NAM', FALSE), - ('BN', 'APAC', FALSE), - ('BO', 'LATAM', FALSE), - ('BQ', 'LATAM', FALSE), - ('BR', 'LATAM', FALSE), - ('BS', 'LATAM', FALSE), - ('BT', 'APAC', FALSE), - ('BV', 'EMEA', FALSE), - ('BW', 'EMEA', FALSE), - ('BY', 'EMEA', FALSE), - ('BZ', 'LATAM', FALSE), - ('CA', 'NAM', FALSE), - ('CC', 'APAC', FALSE), - ('CD', 'EMEA', FALSE), - ('CF', 'EMEA', FALSE), - ('CG', 'EMEA', FALSE), - ('CH', 'EMEA', FALSE), - ('CI', 'EMEA', FALSE), - ('CK', 'APAC', FALSE), - ('CL', 'LATAM', FALSE), - ('CM', 'EMEA', FALSE), - ('CN', 'APAC', FALSE), - ('CO', 'LATAM', FALSE), - ('CR', 'LATAM', FALSE), - ('CU', 'LATAM', FALSE), - ('CV', 'EMEA', FALSE), - ('CW', 'LATAM', FALSE), - ('CX', 'APAC', FALSE), - ('CY', 'EMEA', FALSE), - ('CZ', 'EMEA', FALSE), - ('DE', 'EMEA', FALSE), - ('DJ', 'EMEA', FALSE), - ('DK', 'EMEA', FALSE), - ('DM', 'LATAM', FALSE), - ('DO', 'LATAM', FALSE), - ('DZ', 'EMEA', FALSE), - ('EC', 'LATAM', FALSE), - ('EE', 'EMEA', FALSE), - ('EG', 'EMEA', FALSE), - ('EH', 'EMEA', FALSE), - ('ER', 'EMEA', FALSE), - ('ES', 'EMEA', FALSE), - ('ET', 'EMEA', FALSE), - ('FI', 'EMEA', FALSE), - ('FJ', 'APAC', FALSE), - ('FK', 'LATAM', FALSE), - ('FM', 'APAC', FALSE), - ('FO', 'EMEA', FALSE), - ('FR', 'EMEA', FALSE), - ('GA', 'EMEA', FALSE), - ('GB', 'EMEA', FALSE), - ('GD', 'LATAM', FALSE), - ('GE', 'EMEA', FALSE), - ('GF', 'LATAM', FALSE), - ('GG', 'EMEA', FALSE), - ('GH', 'EMEA', FALSE), - ('GI', 'EMEA', FALSE), - ('GL', 'NAM', FALSE), - ('GM', 'EMEA', FALSE), - ('GN', 'EMEA', FALSE), - ('GP', 'LATAM', FALSE), - ('GQ', 'EMEA', FALSE), - ('GR', 'EMEA', FALSE), - ('GS', 'LATAM', FALSE), - ('GT', 'LATAM', FALSE), - ('GU', 'APAC', FALSE), - ('GW', 'EMEA', FALSE), - ('GY', 'LATAM', FALSE), - ('HK', 'APAC', FALSE), - ('HM', 'APAC', FALSE), - ('HN', 'LATAM', FALSE), - ('HR', 'EMEA', FALSE), - ('HT', 'LATAM', FALSE), - ('HU', 'EMEA', FALSE), - ('ID', 'APAC', FALSE), - ('IE', 'EMEA', FALSE), - ('IL', 'EMEA', FALSE), - ('IM', 'EMEA', FALSE), - ('IN', 'APAC', FALSE), - ('IO', 'APAC', FALSE), - ('IQ', 'EMEA', FALSE), - ('IR', 'EMEA', FALSE), - ('IS', 'EMEA', FALSE), - ('IT', 'EMEA', FALSE), - ('JE', 'EMEA', FALSE), - ('JM', 'LATAM', FALSE), - ('JO', 'EMEA', FALSE), - ('JP', 'APAC', FALSE), - ('KE', 'EMEA', FALSE), - ('KG', 'EMEA', FALSE), - ('KH', 'APAC', FALSE), - ('KI', 'APAC', FALSE), - ('KM', 'EMEA', FALSE), - ('KN', 'LATAM', FALSE), - ('KP', 'APAC', FALSE), - ('KR', 'APAC', FALSE), - ('KW', 'EMEA', FALSE), - ('KY', 'LATAM', FALSE), - ('KZ', 'EMEA', FALSE), - ('LA', 'APAC', FALSE), - ('LB', 'EMEA', FALSE), - ('LC', 'LATAM', FALSE), - ('LI', 'EMEA', FALSE), - ('LK', 'APAC', FALSE), - ('LR', 'EMEA', FALSE), - ('LS', 'EMEA', FALSE), - ('LT', 'EMEA', FALSE), - ('LU', 'EMEA', FALSE), - ('LV', 'EMEA', FALSE), - ('LY', 'EMEA', FALSE), - ('MA', 'EMEA', FALSE), - ('MC', 'EMEA', FALSE), - ('MD', 'EMEA', FALSE), - ('ME', 'EMEA', FALSE), - ('MF', 'LATAM', FALSE), - ('MG', 'EMEA', FALSE), - ('MH', 'APAC', FALSE), - ('MK', 'EMEA', FALSE), - ('ML', 'EMEA', FALSE), - ('MM', 'APAC', FALSE), - ('MN', 'APAC', FALSE), - ('MO', 'APAC', FALSE), - ('MP', 'APAC', FALSE), - ('MQ', 'LATAM', FALSE), - ('MR', 'EMEA', FALSE), - ('MS', 'LATAM', FALSE), - ('MT', 'EMEA', FALSE), - ('MU', 'EMEA', FALSE), - ('MV', 'APAC', FALSE), - ('MW', 'EMEA', FALSE), - ('MX', 'LATAM', FALSE), - ('MY', 'APAC', FALSE), - ('MZ', 'EMEA', FALSE), - ('NA', 'EMEA', FALSE), - ('NC', 'APAC', FALSE), - ('NE', 'EMEA', FALSE), - ('NF', 'APAC', FALSE), - ('NG', 'EMEA', FALSE), - ('NI', 'LATAM', FALSE), - ('NL', 'EMEA', FALSE), - ('NO', 'EMEA', FALSE), - ('NP', 'APAC', FALSE), - ('NR', 'APAC', FALSE), - ('NU', 'APAC', FALSE), - ('NZ', 'APAC', FALSE), - ('OM', 'EMEA', FALSE), - ('PA', 'LATAM', FALSE), - ('PE', 'LATAM', FALSE), - ('PF', 'APAC', FALSE), - ('PG', 'APAC', FALSE), - ('PH', 'APAC', FALSE), - ('PK', 'APAC', FALSE), - ('PL', 'EMEA', FALSE), - ('PM', 'NAM', FALSE), - ('PN', 'APAC', FALSE), - ('PR', 'LATAM', FALSE), - ('PS', 'EMEA', FALSE), - ('PT', 'EMEA', FALSE), - ('PW', 'APAC', FALSE), - ('PY', 'LATAM', FALSE), - ('QA', 'EMEA', FALSE), - ('RE', 'EMEA', FALSE), - ('RO', 'EMEA', FALSE), - ('RS', 'EMEA', FALSE), - ('RU', 'EMEA', FALSE), - ('RW', 'EMEA', FALSE), - ('SA', 'EMEA', FALSE), - ('SB', 'APAC', FALSE), - ('SC', 'EMEA', FALSE), - ('SD', 'EMEA', FALSE), - ('SE', 'EMEA', FALSE), - ('SG', 'APAC', FALSE), - ('SH', 'EMEA', FALSE), - ('SI', 'EMEA', FALSE), - ('SJ', 'EMEA', FALSE), - ('SK', 'EMEA', FALSE), - ('SL', 'EMEA', FALSE), - ('SM', 'EMEA', FALSE), - ('SN', 'EMEA', FALSE), - ('SO', 'EMEA', FALSE), - ('SR', 'LATAM', FALSE), - ('SS', 'EMEA', FALSE), - ('ST', 'EMEA', FALSE), - ('SV', 'LATAM', FALSE), - ('SX', 'LATAM', FALSE), - ('SY', 'EMEA', FALSE), - ('SZ', 'EMEA', FALSE), - ('TC', 'LATAM', FALSE), - ('TD', 'EMEA', FALSE), - ('TF', 'EMEA', FALSE), - ('TG', 'EMEA', FALSE), - ('TH', 'APAC', FALSE), - ('TJ', 'EMEA', FALSE), - ('TK', 'APAC', FALSE), - ('TL', 'APAC', FALSE), - ('TM', 'EMEA', FALSE), - ('TN', 'EMEA', FALSE), - ('TO', 'APAC', FALSE), - ('TR', 'EMEA', FALSE), - ('TT', 'LATAM', FALSE), - ('TV', 'APAC', FALSE), - ('TW', 'APAC', FALSE), - ('TZ', 'EMEA', FALSE), - ('UA', 'EMEA', FALSE), - ('UG', 'EMEA', FALSE), - ('UM', 'APAC', FALSE), - ('US', 'NAM', FALSE), - ('UY', 'LATAM', FALSE), - ('UZ', 'EMEA', FALSE), - ('VA', 'EMEA', FALSE), - ('VC', 'LATAM', FALSE), - ('VE', 'LATAM', FALSE), - ('VG', 'LATAM', FALSE), - ('VI', 'LATAM', FALSE), - ('VN', 'APAC', FALSE), - ('VU', 'APAC', FALSE), - ('WF', 'APAC', FALSE), - ('WS', 'APAC', FALSE), - ('YE', 'EMEA', FALSE), - ('YT', 'EMEA', FALSE), - ('ZA', 'EMEA', FALSE), - ('ZM', 'EMEA', FALSE), - ('ZW', 'EMEA', FALSE), - ('XK', 'EMEA', FALSE); +INSERT INTO `country` (`iso_code`, `name`, `region_code`, `is_deprecated`) VALUES + ('AD', 'Andorra', 'EMEA', FALSE), + ('AE', 'United Arab Emirates', 'EMEA', FALSE), + ('AF', 'Afghanistan', 'EMEA', FALSE), + ('AG', 'Antigua and Barbuda', 'LATAM', FALSE), + ('AI', 'Anguilla', 'LATAM', FALSE), + ('AL', 'Albania', 'EMEA', FALSE), + ('AM', 'Armenia', 'EMEA', FALSE), + ('AO', 'Angola', 'EMEA', FALSE), + ('AQ', 'Antarctica', 'EMEA', FALSE), + ('AR', 'Argentina', 'LATAM', FALSE), + ('AS', 'American Samoa', 'APAC', FALSE), + ('AT', 'Austria', 'EMEA', FALSE), + ('AU', 'Australia', 'APAC', FALSE), + ('AW', 'Aruba', 'LATAM', FALSE), + ('AX', 'Åland Islands', 'EMEA', FALSE), + ('AZ', 'Azerbaijan', 'EMEA', FALSE), + ('BA', 'Bosnia and Herzegovina', 'EMEA', FALSE), + ('BB', 'Barbados', 'LATAM', FALSE), + ('BD', 'Bangladesh', 'EMEA', FALSE), + ('BE', 'Belgium', 'EMEA', FALSE), + ('BF', 'Burkina Faso', 'EMEA', FALSE), + ('BG', 'Bulgaria', 'EMEA', FALSE), + ('BH', 'Bahrain', 'EMEA', FALSE), + ('BI', 'Burundi', 'EMEA', FALSE), + ('BJ', 'Benin', 'EMEA', FALSE), + ('BL', 'Saint Barthélemy', 'LATAM', FALSE), + ('BM', 'Bermuda', 'NAM', FALSE), + ('BN', 'Brunei Darussalam', 'APAC', FALSE), + ('BO', 'Bolivia', 'LATAM', FALSE), + ('BQ', 'Bonaire, Sint Eustatius and Saba', 'LATAM', FALSE), + ('BR', 'Brazil', 'LATAM', FALSE), + ('BS', 'Bahamas', 'LATAM', FALSE), + ('BT', 'Bhutan', 'APAC', FALSE), + ('BV', 'Bouvet Island', 'EMEA', FALSE), + ('BW', 'Botswana', 'EMEA', FALSE), + ('BY', 'Belarus', 'EMEA', FALSE), + ('BZ', 'Belize', 'LATAM', FALSE), + ('CA', 'Canada', 'NAM', FALSE), + ('CC', 'Cocos (Keeling) Islands', 'APAC', FALSE), + ('CD', 'Congo, Democratic Republic', 'EMEA', FALSE), + ('CF', 'Central African Republic', 'EMEA', FALSE), + ('CG', 'Congo', 'EMEA', FALSE), + ('CH', 'Switzerland', 'EMEA', FALSE), + ('CI', 'Côte d''Ivoire', 'EMEA', FALSE), + ('CK', 'Cook Islands', 'APAC', FALSE), + ('CL', 'Chile', 'LATAM', FALSE), + ('CM', 'Cameroon', 'EMEA', FALSE), + ('CN', 'China', 'APAC', FALSE), + ('CO', 'Colombia', 'LATAM', FALSE), + ('CR', 'Costa Rica', 'LATAM', FALSE), + ('CU', 'Cuba', 'LATAM', FALSE), + ('CV', 'Cabo Verde', 'EMEA', FALSE), + ('CW', 'Curaçao', 'LATAM', FALSE), + ('CX', 'Christmas Island', 'APAC', FALSE), + ('CY', 'Cyprus', 'EMEA', FALSE), + ('CZ', 'Czech Republic', 'EMEA', FALSE), + ('DE', 'Germany', 'EMEA', FALSE), + ('DJ', 'Djibouti', 'EMEA', FALSE), + ('DK', 'Denmark', 'EMEA', FALSE), + ('DM', 'Dominica', 'LATAM', FALSE), + ('DO', 'Dominican Republic', 'LATAM', FALSE), + ('DZ', 'Algeria', 'EMEA', FALSE), + ('EC', 'Ecuador', 'LATAM', FALSE), + ('EE', 'Estonia', 'EMEA', FALSE), + ('EG', 'Egypt', 'EMEA', FALSE), + ('EH', 'Western Sahara', 'EMEA', FALSE), + ('ER', 'Eritrea', 'EMEA', FALSE), + ('ES', 'Spain', 'EMEA', FALSE), + ('ET', 'Ethiopia', 'EMEA', FALSE), + ('FI', 'Finland', 'EMEA', FALSE), + ('FJ', 'Fiji', 'APAC', FALSE), + ('FK', 'Falkland Islands', 'LATAM', FALSE), + ('FM', 'Micronesia', 'APAC', FALSE), + ('FO', 'Faroe Islands', 'EMEA', FALSE), + ('FR', 'France', 'EMEA', FALSE), + ('GA', 'Gabon', 'EMEA', FALSE), + ('GB', 'United Kingdom', 'EMEA', FALSE), + ('GD', 'Grenada', 'LATAM', FALSE), + ('GE', 'Georgia', 'EMEA', FALSE), + ('GF', 'French Guiana', 'LATAM', FALSE), + ('GG', 'Guernsey', 'EMEA', FALSE), + ('GH', 'Ghana', 'EMEA', FALSE), + ('GI', 'Gibraltar', 'EMEA', FALSE), + ('GL', 'Greenland', 'NAM', FALSE), + ('GM', 'Gambia', 'EMEA', FALSE), + ('GN', 'Guinea', 'EMEA', FALSE), + ('GP', 'Guadeloupe', 'LATAM', FALSE), + ('GQ', 'Equatorial Guinea', 'EMEA', FALSE), + ('GR', 'Greece', 'EMEA', FALSE), + ('GS', 'South Georgia and South Sandwich Islands', 'LATAM', FALSE), + ('GT', 'Guatemala', 'LATAM', FALSE), + ('GU', 'Guam', 'APAC', FALSE), + ('GW', 'Guinea-Bissau', 'EMEA', FALSE), + ('GY', 'Guyana', 'LATAM', FALSE), + ('HK', 'Hong Kong', 'APAC', FALSE), + ('HM', 'Heard Island and McDonald Islands', 'APAC', FALSE), + ('HN', 'Honduras', 'LATAM', FALSE), + ('HR', 'Croatia', 'EMEA', FALSE), + ('HT', 'Haiti', 'LATAM', FALSE), + ('HU', 'Hungary', 'EMEA', FALSE), + ('ID', 'Indonesia', 'APAC', FALSE), + ('IE', 'Ireland', 'EMEA', FALSE), + ('IL', 'Israel', 'EMEA', FALSE), + ('IM', 'Isle of Man', 'EMEA', FALSE), + ('IN', 'India', 'APAC', FALSE), + ('IO', 'British Indian Ocean Territory', 'APAC', FALSE), + ('IQ', 'Iraq', 'EMEA', FALSE), + ('IR', 'Iran', 'EMEA', FALSE), + ('IS', 'Iceland', 'EMEA', FALSE), + ('IT', 'Italy', 'EMEA', FALSE), + ('JE', 'Jersey', 'EMEA', FALSE), + ('JM', 'Jamaica', 'LATAM', FALSE), + ('JO', 'Jordan', 'EMEA', FALSE), + ('JP', 'Japan', 'APAC', FALSE), + ('KE', 'Kenya', 'EMEA', FALSE), + ('KG', 'Kyrgyzstan', 'EMEA', FALSE), + ('KH', 'Cambodia', 'APAC', FALSE), + ('KI', 'Kiribati', 'APAC', FALSE), + ('KM', 'Comoros', 'EMEA', FALSE), + ('KN', 'Saint Kitts and Nevis', 'LATAM', FALSE), + ('KP', 'Korea, North', 'APAC', FALSE), + ('KR', 'Korea, South', 'APAC', FALSE), + ('KW', 'Kuwait', 'EMEA', FALSE), + ('KY', 'Cayman Islands', 'LATAM', FALSE), + ('KZ', 'Kazakhstan', 'EMEA', FALSE), + ('LA', 'Laos', 'APAC', FALSE), + ('LB', 'Lebanon', 'EMEA', FALSE), + ('LC', 'Saint Lucia', 'LATAM', FALSE), + ('LI', 'Liechtenstein', 'EMEA', FALSE), + ('LK', 'Sri Lanka', 'APAC', FALSE), + ('LR', 'Liberia', 'EMEA', FALSE), + ('LS', 'Lesotho', 'EMEA', FALSE), + ('LT', 'Lithuania', 'EMEA', FALSE), + ('LU', 'Luxembourg', 'EMEA', FALSE), + ('LV', 'Latvia', 'EMEA', FALSE), + ('LY', 'Libya', 'EMEA', FALSE), + ('MA', 'Morocco', 'EMEA', FALSE), + ('MC', 'Monaco', 'EMEA', FALSE), + ('MD', 'Moldova', 'EMEA', FALSE), + ('ME', 'Montenegro', 'EMEA', FALSE), + ('MF', 'Saint Martin', 'LATAM', FALSE), + ('MG', 'Madagascar', 'EMEA', FALSE), + ('MH', 'Marshall Islands', 'APAC', FALSE), + ('MK', 'North Macedonia', 'EMEA', FALSE), + ('ML', 'Mali', 'EMEA', FALSE), + ('MM', 'Myanmar', 'APAC', FALSE), + ('MN', 'Mongolia', 'APAC', FALSE), + ('MO', 'Macao', 'APAC', FALSE), + ('MP', 'Northern Mariana Islands', 'APAC', FALSE), + ('MQ', 'Martinique', 'LATAM', FALSE), + ('MR', 'Mauritania', 'EMEA', FALSE), + ('MS', 'Montserrat', 'LATAM', FALSE), + ('MT', 'Malta', 'EMEA', FALSE), + ('MU', 'Mauritius', 'EMEA', FALSE), + ('MV', 'Maldives', 'APAC', FALSE), + ('MW', 'Malawi', 'EMEA', FALSE), + ('MX', 'Mexico', 'LATAM', FALSE), + ('MY', 'Malaysia', 'APAC', FALSE), + ('MZ', 'Mozambique', 'EMEA', FALSE), + ('NA', 'Namibia', 'EMEA', FALSE), + ('NC', 'New Caledonia', 'APAC', FALSE), + ('NE', 'Niger', 'EMEA', FALSE), + ('NF', 'Norfolk Island', 'APAC', FALSE), + ('NG', 'Nigeria', 'EMEA', FALSE), + ('NI', 'Nicaragua', 'LATAM', FALSE), + ('NL', 'Netherlands', 'EMEA', FALSE), + ('NO', 'Norway', 'EMEA', FALSE), + ('NP', 'Nepal', 'APAC', FALSE), + ('NR', 'Nauru', 'APAC', FALSE), + ('NU', 'Niue', 'APAC', FALSE), + ('NZ', 'New Zealand', 'APAC', FALSE), + ('OM', 'Oman', 'EMEA', FALSE), + ('PA', 'Panama', 'LATAM', FALSE), + ('PE', 'Peru', 'LATAM', FALSE), + ('PF', 'French Polynesia', 'APAC', FALSE), + ('PG', 'Papua New Guinea', 'APAC', FALSE), + ('PH', 'Philippines', 'APAC', FALSE), + ('PK', 'Pakistan', 'APAC', FALSE), + ('PL', 'Poland', 'EMEA', FALSE), + ('PM', 'Saint Pierre and Miquelon', 'NAM', FALSE), + ('PN', 'Pitcairn', 'APAC', FALSE), + ('PR', 'Puerto Rico', 'LATAM', FALSE), + ('PS', 'Palestine', 'EMEA', FALSE), + ('PT', 'Portugal', 'EMEA', FALSE), + ('PW', 'Palau', 'APAC', FALSE), + ('PY', 'Paraguay', 'LATAM', FALSE), + ('QA', 'Qatar', 'EMEA', FALSE), + ('RE', 'Réunion', 'EMEA', FALSE), + ('RO', 'Romania', 'EMEA', FALSE), + ('RS', 'Serbia', 'EMEA', FALSE), + ('RU', 'Russian Federation', 'EMEA', FALSE), + ('RW', 'Rwanda', 'EMEA', FALSE), + ('SA', 'Saudi Arabia', 'EMEA', FALSE), + ('SB', 'Solomon Islands', 'APAC', FALSE), + ('SC', 'Seychelles', 'EMEA', FALSE), + ('SD', 'Sudan', 'EMEA', FALSE), + ('SE', 'Sweden', 'EMEA', FALSE), + ('SG', 'Singapore', 'APAC', FALSE), + ('SH', 'Saint Helena', 'EMEA', FALSE), + ('SI', 'Slovenia', 'EMEA', FALSE), + ('SJ', 'Svalbard and Jan Mayen', 'EMEA', FALSE), + ('SK', 'Slovakia', 'EMEA', FALSE), + ('SL', 'Sierra Leone', 'EMEA', FALSE), + ('SM', 'San Marino', 'EMEA', FALSE), + ('SN', 'Senegal', 'EMEA', FALSE), + ('SO', 'Somalia', 'EMEA', FALSE), + ('SR', 'Suriname', 'LATAM', FALSE), + ('SS', 'South Sudan', 'EMEA', FALSE), + ('ST', 'Sao Tome and Principe', 'EMEA', FALSE), + ('SV', 'El Salvador', 'LATAM', FALSE), + ('SX', 'Sint Maarten', 'LATAM', FALSE), + ('SY', 'Syrian Arab Republic', 'EMEA', FALSE), + ('SZ', 'Eswatini', 'EMEA', FALSE), + ('TC', 'Turks and Caicos Islands', 'LATAM', FALSE), + ('TD', 'Chad', 'EMEA', FALSE), + ('TF', 'French Southern Territories', 'EMEA', FALSE), + ('TG', 'Togo', 'EMEA', FALSE), + ('TH', 'Thailand', 'APAC', FALSE), + ('TJ', 'Tajikistan', 'EMEA', FALSE), + ('TK', 'Tokelau', 'APAC', FALSE), + ('TL', 'Timor-Leste', 'APAC', FALSE), + ('TM', 'Turkmenistan', 'EMEA', FALSE), + ('TN', 'Tunisia', 'EMEA', FALSE), + ('TO', 'Tonga', 'APAC', FALSE), + ('TR', 'Turkey', 'EMEA', FALSE), + ('TT', 'Trinidad and Tobago', 'LATAM', FALSE), + ('TV', 'Tuvalu', 'APAC', FALSE), + ('TW', 'Taiwan', 'APAC', FALSE), + ('TZ', 'Tanzania', 'EMEA', FALSE), + ('UA', 'Ukraine', 'EMEA', FALSE), + ('UG', 'Uganda', 'EMEA', FALSE), + ('UM', 'United States Minor Outlying Islands', 'APAC', FALSE), + ('US', 'United States', 'NAM', FALSE), + ('UY', 'Uruguay', 'LATAM', FALSE), + ('UZ', 'Uzbekistan', 'EMEA', FALSE), + ('VA', 'Vatican City', 'EMEA', FALSE), + ('VC', 'Saint Vincent and the Grenadines', 'LATAM', FALSE), + ('VE', 'Venezuela', 'LATAM', FALSE), + ('VG', 'Virgin Islands, British', 'LATAM', FALSE), + ('VI', 'Virgin Islands, U.S.', 'LATAM', FALSE), + ('VN', 'Viet Nam', 'APAC', FALSE), + ('VU', 'Vanuatu', 'APAC', FALSE), + ('WF', 'Wallis and Futuna', 'APAC', FALSE), + ('WS', 'Samoa', 'APAC', FALSE), + ('YE', 'Yemen', 'EMEA', FALSE), + ('YT', 'Mayotte', 'EMEA', FALSE), + ('ZA', 'South Africa', 'EMEA', FALSE), + ('ZM', 'Zambia', 'EMEA', FALSE), + ('ZW', 'Zimbabwe', 'EMEA', FALSE), + ('XK', 'Kosovo', 'EMEA', FALSE); -- ============================================================================= -- 3. INSERT COUNTRY PROPERTIES @@ -307,10 +307,13 @@ SELECT AND (ps.end_date IS NULL OR ps.end_date > NOW()) ORDER BY ps.start_date DESC LIMIT 1), - 'EU' + CASE + WHEN c.iso_code IN ('AT', 'BE', 'BG', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK') + THEN 'EU' + ELSE 'NONE' + END FROM `country` c, `country_property_type` cpt -WHERE c.iso_code IN ('AT', 'BE', 'BG', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK') - AND cpt.external_mapping_id = 'UNION'; +WHERE cpt.external_mapping_id = 'UNION'; -- Safety Stock Properties INSERT INTO `country_property` @@ -635,10 +638,10 @@ SELECT WHEN 'SE' THEN '0.94' WHEN 'SI' THEN '0.62' WHEN 'SK' THEN '0.42' + ELSE '1' END FROM `country` c, `country_property_type` cpt -WHERE c.iso_code IN ('AT', 'BE', 'BG', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK') - AND cpt.external_mapping_id = 'WAGE'; +WHERE cpt.external_mapping_id = 'WAGE'; -- ============================================================================= -- VERIFICATION QUERIES (Optional - for testing) diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 9481bb4..1e9bf3d 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -48,6 +48,7 @@ CREATE TABLE IF NOT EXISTS `country` `id` INT NOT NULL AUTO_INCREMENT, `iso_code` CHAR(2) NOT NULL COMMENT 'ISO 3166-1 alpha-2 country code', `region_code` CHAR(5) NOT NULL COMMENT 'Geographic region code (EMEA/LATAM/APAC/NAM)', + `name` VARCHAR(255) NOT NULL, `is_deprecated` BOOLEAN NOT NULL DEFAULT FALSE, PRIMARY KEY (`id`), UNIQUE KEY `uk_country_iso_code` (`iso_code`), diff --git a/src/test/resources/master_data/alldata.sql b/src/test/resources/master_data/alldata.sql index 09b4265..e30936c 100644 --- a/src/test/resources/master_data/alldata.sql +++ b/src/test/resources/master_data/alldata.sql @@ -644,257 +644,257 @@ VALUES -- 2. INSERT COUNTRIES -- ============================================================================= -INSERT INTO `country` (`iso_code`, `region_code`, `is_deprecated`) VALUES - ('AD', 'EMEA', FALSE), - ('AE', 'EMEA', FALSE), - ('AF', 'EMEA', FALSE), - ('AG', 'LATAM', FALSE), - ('AI', 'LATAM', FALSE), - ('AL', 'EMEA', FALSE), - ('AM', 'EMEA', FALSE), - ('AO', 'EMEA', FALSE), - ('AQ', 'EMEA', FALSE), - ('AR', 'LATAM', FALSE), - ('AS', 'APAC', FALSE), - ('AT', 'EMEA', FALSE), - ('AU', 'APAC', FALSE), - ('AW', 'LATAM', FALSE), - ('AX', 'EMEA', FALSE), - ('AZ', 'EMEA', FALSE), - ('BA', 'EMEA', FALSE), - ('BB', 'LATAM', FALSE), - ('BD', 'EMEA', FALSE), - ('BE', 'EMEA', FALSE), - ('BF', 'EMEA', FALSE), - ('BG', 'EMEA', FALSE), - ('BH', 'EMEA', FALSE), - ('BI', 'EMEA', FALSE), - ('BJ', 'EMEA', FALSE), - ('BL', 'LATAM', FALSE), - ('BM', 'NAM', FALSE), - ('BN', 'APAC', FALSE), - ('BO', 'LATAM', FALSE), - ('BQ', 'LATAM', FALSE), - ('BR', 'LATAM', FALSE), - ('BS', 'LATAM', FALSE), - ('BT', 'APAC', FALSE), - ('BV', 'EMEA', FALSE), - ('BW', 'EMEA', FALSE), - ('BY', 'EMEA', FALSE), - ('BZ', 'LATAM', FALSE), - ('CA', 'NAM', FALSE), - ('CC', 'APAC', FALSE), - ('CD', 'EMEA', FALSE), - ('CF', 'EMEA', FALSE), - ('CG', 'EMEA', FALSE), - ('CH', 'EMEA', FALSE), - ('CI', 'EMEA', FALSE), - ('CK', 'APAC', FALSE), - ('CL', 'LATAM', FALSE), - ('CM', 'EMEA', FALSE), - ('CN', 'APAC', FALSE), - ('CO', 'LATAM', FALSE), - ('CR', 'LATAM', FALSE), - ('CU', 'LATAM', FALSE), - ('CV', 'EMEA', FALSE), - ('CW', 'LATAM', FALSE), - ('CX', 'APAC', FALSE), - ('CY', 'EMEA', FALSE), - ('CZ', 'EMEA', FALSE), - ('DE', 'EMEA', FALSE), - ('DJ', 'EMEA', FALSE), - ('DK', 'EMEA', FALSE), - ('DM', 'LATAM', FALSE), - ('DO', 'LATAM', FALSE), - ('DZ', 'EMEA', FALSE), - ('EC', 'LATAM', FALSE), - ('EE', 'EMEA', FALSE), - ('EG', 'EMEA', FALSE), - ('EH', 'EMEA', FALSE), - ('ER', 'EMEA', FALSE), - ('ES', 'EMEA', FALSE), - ('ET', 'EMEA', FALSE), - ('FI', 'EMEA', FALSE), - ('FJ', 'APAC', FALSE), - ('FK', 'LATAM', FALSE), - ('FM', 'APAC', FALSE), - ('FO', 'EMEA', FALSE), - ('FR', 'EMEA', FALSE), - ('GA', 'EMEA', FALSE), - ('GB', 'EMEA', FALSE), - ('GD', 'LATAM', FALSE), - ('GE', 'EMEA', FALSE), - ('GF', 'LATAM', FALSE), - ('GG', 'EMEA', FALSE), - ('GH', 'EMEA', FALSE), - ('GI', 'EMEA', FALSE), - ('GL', 'NAM', FALSE), - ('GM', 'EMEA', FALSE), - ('GN', 'EMEA', FALSE), - ('GP', 'LATAM', FALSE), - ('GQ', 'EMEA', FALSE), - ('GR', 'EMEA', FALSE), - ('GS', 'LATAM', FALSE), - ('GT', 'LATAM', FALSE), - ('GU', 'APAC', FALSE), - ('GW', 'EMEA', FALSE), - ('GY', 'LATAM', FALSE), - ('HK', 'APAC', FALSE), - ('HM', 'APAC', FALSE), - ('HN', 'LATAM', FALSE), - ('HR', 'EMEA', FALSE), - ('HT', 'LATAM', FALSE), - ('HU', 'EMEA', FALSE), - ('ID', 'APAC', FALSE), - ('IE', 'EMEA', FALSE), - ('IL', 'EMEA', FALSE), - ('IM', 'EMEA', FALSE), - ('IN', 'APAC', FALSE), - ('IO', 'APAC', FALSE), - ('IQ', 'EMEA', FALSE), - ('IR', 'EMEA', FALSE), - ('IS', 'EMEA', FALSE), - ('IT', 'EMEA', FALSE), - ('JE', 'EMEA', FALSE), - ('JM', 'LATAM', FALSE), - ('JO', 'EMEA', FALSE), - ('JP', 'APAC', FALSE), - ('KE', 'EMEA', FALSE), - ('KG', 'EMEA', FALSE), - ('KH', 'APAC', FALSE), - ('KI', 'APAC', FALSE), - ('KM', 'EMEA', FALSE), - ('KN', 'LATAM', FALSE), - ('KP', 'APAC', FALSE), - ('KR', 'APAC', FALSE), - ('KW', 'EMEA', FALSE), - ('KY', 'LATAM', FALSE), - ('KZ', 'EMEA', FALSE), - ('LA', 'APAC', FALSE), - ('LB', 'EMEA', FALSE), - ('LC', 'LATAM', FALSE), - ('LI', 'EMEA', FALSE), - ('LK', 'APAC', FALSE), - ('LR', 'EMEA', FALSE), - ('LS', 'EMEA', FALSE), - ('LT', 'EMEA', FALSE), - ('LU', 'EMEA', FALSE), - ('LV', 'EMEA', FALSE), - ('LY', 'EMEA', FALSE), - ('MA', 'EMEA', FALSE), - ('MC', 'EMEA', FALSE), - ('MD', 'EMEA', FALSE), - ('ME', 'EMEA', FALSE), - ('MF', 'LATAM', FALSE), - ('MG', 'EMEA', FALSE), - ('MH', 'APAC', FALSE), - ('MK', 'EMEA', FALSE), - ('ML', 'EMEA', FALSE), - ('MM', 'APAC', FALSE), - ('MN', 'APAC', FALSE), - ('MO', 'APAC', FALSE), - ('MP', 'APAC', FALSE), - ('MQ', 'LATAM', FALSE), - ('MR', 'EMEA', FALSE), - ('MS', 'LATAM', FALSE), - ('MT', 'EMEA', FALSE), - ('MU', 'EMEA', FALSE), - ('MV', 'APAC', FALSE), - ('MW', 'EMEA', FALSE), - ('MX', 'LATAM', FALSE), - ('MY', 'APAC', FALSE), - ('MZ', 'EMEA', FALSE), - ('NA', 'EMEA', FALSE), - ('NC', 'APAC', FALSE), - ('NE', 'EMEA', FALSE), - ('NF', 'APAC', FALSE), - ('NG', 'EMEA', FALSE), - ('NI', 'LATAM', FALSE), - ('NL', 'EMEA', FALSE), - ('NO', 'EMEA', FALSE), - ('NP', 'APAC', FALSE), - ('NR', 'APAC', FALSE), - ('NU', 'APAC', FALSE), - ('NZ', 'APAC', FALSE), - ('OM', 'EMEA', FALSE), - ('PA', 'LATAM', FALSE), - ('PE', 'LATAM', FALSE), - ('PF', 'APAC', FALSE), - ('PG', 'APAC', FALSE), - ('PH', 'APAC', FALSE), - ('PK', 'APAC', FALSE), - ('PL', 'EMEA', FALSE), - ('PM', 'NAM', FALSE), - ('PN', 'APAC', FALSE), - ('PR', 'LATAM', FALSE), - ('PS', 'EMEA', FALSE), - ('PT', 'EMEA', FALSE), - ('PW', 'APAC', FALSE), - ('PY', 'LATAM', FALSE), - ('QA', 'EMEA', FALSE), - ('RE', 'EMEA', FALSE), - ('RO', 'EMEA', FALSE), - ('RS', 'EMEA', FALSE), - ('RU', 'EMEA', FALSE), - ('RW', 'EMEA', FALSE), - ('SA', 'EMEA', FALSE), - ('SB', 'APAC', FALSE), - ('SC', 'EMEA', FALSE), - ('SD', 'EMEA', FALSE), - ('SE', 'EMEA', FALSE), - ('SG', 'APAC', FALSE), - ('SH', 'EMEA', FALSE), - ('SI', 'EMEA', FALSE), - ('SJ', 'EMEA', FALSE), - ('SK', 'EMEA', FALSE), - ('SL', 'EMEA', FALSE), - ('SM', 'EMEA', FALSE), - ('SN', 'EMEA', FALSE), - ('SO', 'EMEA', FALSE), - ('SR', 'LATAM', FALSE), - ('SS', 'EMEA', FALSE), - ('ST', 'EMEA', FALSE), - ('SV', 'LATAM', FALSE), - ('SX', 'LATAM', FALSE), - ('SY', 'EMEA', FALSE), - ('SZ', 'EMEA', FALSE), - ('TC', 'LATAM', FALSE), - ('TD', 'EMEA', FALSE), - ('TF', 'EMEA', FALSE), - ('TG', 'EMEA', FALSE), - ('TH', 'APAC', FALSE), - ('TJ', 'EMEA', FALSE), - ('TK', 'APAC', FALSE), - ('TL', 'APAC', FALSE), - ('TM', 'EMEA', FALSE), - ('TN', 'EMEA', FALSE), - ('TO', 'APAC', FALSE), - ('TR', 'EMEA', FALSE), - ('TT', 'LATAM', FALSE), - ('TV', 'APAC', FALSE), - ('TW', 'APAC', FALSE), - ('TZ', 'EMEA', FALSE), - ('UA', 'EMEA', FALSE), - ('UG', 'EMEA', FALSE), - ('UM', 'APAC', FALSE), - ('US', 'NAM', FALSE), - ('UY', 'LATAM', FALSE), - ('UZ', 'EMEA', FALSE), - ('VA', 'EMEA', FALSE), - ('VC', 'LATAM', FALSE), - ('VE', 'LATAM', FALSE), - ('VG', 'LATAM', FALSE), - ('VI', 'LATAM', FALSE), - ('VN', 'APAC', FALSE), - ('VU', 'APAC', FALSE), - ('WF', 'APAC', FALSE), - ('WS', 'APAC', FALSE), - ('YE', 'EMEA', FALSE), - ('YT', 'EMEA', FALSE), - ('ZA', 'EMEA', FALSE), - ('ZM', 'EMEA', FALSE), - ('ZW', 'EMEA', FALSE), - ('XK', 'EMEA', FALSE); +INSERT INTO `country` (`iso_code`, `name`, `region_code`, `is_deprecated`) VALUES + ('AD', 'Andorra', 'EMEA', FALSE), + ('AE', 'United Arab Emirates', 'EMEA', FALSE), + ('AF', 'Afghanistan', 'EMEA', FALSE), + ('AG', 'Antigua and Barbuda', 'LATAM', FALSE), + ('AI', 'Anguilla', 'LATAM', FALSE), + ('AL', 'Albania', 'EMEA', FALSE), + ('AM', 'Armenia', 'EMEA', FALSE), + ('AO', 'Angola', 'EMEA', FALSE), + ('AQ', 'Antarctica', 'EMEA', FALSE), + ('AR', 'Argentina', 'LATAM', FALSE), + ('AS', 'American Samoa', 'APAC', FALSE), + ('AT', 'Austria', 'EMEA', FALSE), + ('AU', 'Australia', 'APAC', FALSE), + ('AW', 'Aruba', 'LATAM', FALSE), + ('AX', 'Åland Islands', 'EMEA', FALSE), + ('AZ', 'Azerbaijan', 'EMEA', FALSE), + ('BA', 'Bosnia and Herzegovina', 'EMEA', FALSE), + ('BB', 'Barbados', 'LATAM', FALSE), + ('BD', 'Bangladesh', 'EMEA', FALSE), + ('BE', 'Belgium', 'EMEA', FALSE), + ('BF', 'Burkina Faso', 'EMEA', FALSE), + ('BG', 'Bulgaria', 'EMEA', FALSE), + ('BH', 'Bahrain', 'EMEA', FALSE), + ('BI', 'Burundi', 'EMEA', FALSE), + ('BJ', 'Benin', 'EMEA', FALSE), + ('BL', 'Saint Barthélemy', 'LATAM', FALSE), + ('BM', 'Bermuda', 'NAM', FALSE), + ('BN', 'Brunei Darussalam', 'APAC', FALSE), + ('BO', 'Bolivia', 'LATAM', FALSE), + ('BQ', 'Bonaire, Sint Eustatius and Saba', 'LATAM', FALSE), + ('BR', 'Brazil', 'LATAM', FALSE), + ('BS', 'Bahamas', 'LATAM', FALSE), + ('BT', 'Bhutan', 'APAC', FALSE), + ('BV', 'Bouvet Island', 'EMEA', FALSE), + ('BW', 'Botswana', 'EMEA', FALSE), + ('BY', 'Belarus', 'EMEA', FALSE), + ('BZ', 'Belize', 'LATAM', FALSE), + ('CA', 'Canada', 'NAM', FALSE), + ('CC', 'Cocos (Keeling) Islands', 'APAC', FALSE), + ('CD', 'Congo, Democratic Republic', 'EMEA', FALSE), + ('CF', 'Central African Republic', 'EMEA', FALSE), + ('CG', 'Congo', 'EMEA', FALSE), + ('CH', 'Switzerland', 'EMEA', FALSE), + ('CI', 'Côte d''Ivoire', 'EMEA', FALSE), + ('CK', 'Cook Islands', 'APAC', FALSE), + ('CL', 'Chile', 'LATAM', FALSE), + ('CM', 'Cameroon', 'EMEA', FALSE), + ('CN', 'China', 'APAC', FALSE), + ('CO', 'Colombia', 'LATAM', FALSE), + ('CR', 'Costa Rica', 'LATAM', FALSE), + ('CU', 'Cuba', 'LATAM', FALSE), + ('CV', 'Cabo Verde', 'EMEA', FALSE), + ('CW', 'Curaçao', 'LATAM', FALSE), + ('CX', 'Christmas Island', 'APAC', FALSE), + ('CY', 'Cyprus', 'EMEA', FALSE), + ('CZ', 'Czech Republic', 'EMEA', FALSE), + ('DE', 'Germany', 'EMEA', FALSE), + ('DJ', 'Djibouti', 'EMEA', FALSE), + ('DK', 'Denmark', 'EMEA', FALSE), + ('DM', 'Dominica', 'LATAM', FALSE), + ('DO', 'Dominican Republic', 'LATAM', FALSE), + ('DZ', 'Algeria', 'EMEA', FALSE), + ('EC', 'Ecuador', 'LATAM', FALSE), + ('EE', 'Estonia', 'EMEA', FALSE), + ('EG', 'Egypt', 'EMEA', FALSE), + ('EH', 'Western Sahara', 'EMEA', FALSE), + ('ER', 'Eritrea', 'EMEA', FALSE), + ('ES', 'Spain', 'EMEA', FALSE), + ('ET', 'Ethiopia', 'EMEA', FALSE), + ('FI', 'Finland', 'EMEA', FALSE), + ('FJ', 'Fiji', 'APAC', FALSE), + ('FK', 'Falkland Islands', 'LATAM', FALSE), + ('FM', 'Micronesia', 'APAC', FALSE), + ('FO', 'Faroe Islands', 'EMEA', FALSE), + ('FR', 'France', 'EMEA', FALSE), + ('GA', 'Gabon', 'EMEA', FALSE), + ('GB', 'United Kingdom', 'EMEA', FALSE), + ('GD', 'Grenada', 'LATAM', FALSE), + ('GE', 'Georgia', 'EMEA', FALSE), + ('GF', 'French Guiana', 'LATAM', FALSE), + ('GG', 'Guernsey', 'EMEA', FALSE), + ('GH', 'Ghana', 'EMEA', FALSE), + ('GI', 'Gibraltar', 'EMEA', FALSE), + ('GL', 'Greenland', 'NAM', FALSE), + ('GM', 'Gambia', 'EMEA', FALSE), + ('GN', 'Guinea', 'EMEA', FALSE), + ('GP', 'Guadeloupe', 'LATAM', FALSE), + ('GQ', 'Equatorial Guinea', 'EMEA', FALSE), + ('GR', 'Greece', 'EMEA', FALSE), + ('GS', 'South Georgia and South Sandwich Islands', 'LATAM', FALSE), + ('GT', 'Guatemala', 'LATAM', FALSE), + ('GU', 'Guam', 'APAC', FALSE), + ('GW', 'Guinea-Bissau', 'EMEA', FALSE), + ('GY', 'Guyana', 'LATAM', FALSE), + ('HK', 'Hong Kong', 'APAC', FALSE), + ('HM', 'Heard Island and McDonald Islands', 'APAC', FALSE), + ('HN', 'Honduras', 'LATAM', FALSE), + ('HR', 'Croatia', 'EMEA', FALSE), + ('HT', 'Haiti', 'LATAM', FALSE), + ('HU', 'Hungary', 'EMEA', FALSE), + ('ID', 'Indonesia', 'APAC', FALSE), + ('IE', 'Ireland', 'EMEA', FALSE), + ('IL', 'Israel', 'EMEA', FALSE), + ('IM', 'Isle of Man', 'EMEA', FALSE), + ('IN', 'India', 'APAC', FALSE), + ('IO', 'British Indian Ocean Territory', 'APAC', FALSE), + ('IQ', 'Iraq', 'EMEA', FALSE), + ('IR', 'Iran', 'EMEA', FALSE), + ('IS', 'Iceland', 'EMEA', FALSE), + ('IT', 'Italy', 'EMEA', FALSE), + ('JE', 'Jersey', 'EMEA', FALSE), + ('JM', 'Jamaica', 'LATAM', FALSE), + ('JO', 'Jordan', 'EMEA', FALSE), + ('JP', 'Japan', 'APAC', FALSE), + ('KE', 'Kenya', 'EMEA', FALSE), + ('KG', 'Kyrgyzstan', 'EMEA', FALSE), + ('KH', 'Cambodia', 'APAC', FALSE), + ('KI', 'Kiribati', 'APAC', FALSE), + ('KM', 'Comoros', 'EMEA', FALSE), + ('KN', 'Saint Kitts and Nevis', 'LATAM', FALSE), + ('KP', 'Korea, North', 'APAC', FALSE), + ('KR', 'Korea, South', 'APAC', FALSE), + ('KW', 'Kuwait', 'EMEA', FALSE), + ('KY', 'Cayman Islands', 'LATAM', FALSE), + ('KZ', 'Kazakhstan', 'EMEA', FALSE), + ('LA', 'Laos', 'APAC', FALSE), + ('LB', 'Lebanon', 'EMEA', FALSE), + ('LC', 'Saint Lucia', 'LATAM', FALSE), + ('LI', 'Liechtenstein', 'EMEA', FALSE), + ('LK', 'Sri Lanka', 'APAC', FALSE), + ('LR', 'Liberia', 'EMEA', FALSE), + ('LS', 'Lesotho', 'EMEA', FALSE), + ('LT', 'Lithuania', 'EMEA', FALSE), + ('LU', 'Luxembourg', 'EMEA', FALSE), + ('LV', 'Latvia', 'EMEA', FALSE), + ('LY', 'Libya', 'EMEA', FALSE), + ('MA', 'Morocco', 'EMEA', FALSE), + ('MC', 'Monaco', 'EMEA', FALSE), + ('MD', 'Moldova', 'EMEA', FALSE), + ('ME', 'Montenegro', 'EMEA', FALSE), + ('MF', 'Saint Martin', 'LATAM', FALSE), + ('MG', 'Madagascar', 'EMEA', FALSE), + ('MH', 'Marshall Islands', 'APAC', FALSE), + ('MK', 'North Macedonia', 'EMEA', FALSE), + ('ML', 'Mali', 'EMEA', FALSE), + ('MM', 'Myanmar', 'APAC', FALSE), + ('MN', 'Mongolia', 'APAC', FALSE), + ('MO', 'Macao', 'APAC', FALSE), + ('MP', 'Northern Mariana Islands', 'APAC', FALSE), + ('MQ', 'Martinique', 'LATAM', FALSE), + ('MR', 'Mauritania', 'EMEA', FALSE), + ('MS', 'Montserrat', 'LATAM', FALSE), + ('MT', 'Malta', 'EMEA', FALSE), + ('MU', 'Mauritius', 'EMEA', FALSE), + ('MV', 'Maldives', 'APAC', FALSE), + ('MW', 'Malawi', 'EMEA', FALSE), + ('MX', 'Mexico', 'LATAM', FALSE), + ('MY', 'Malaysia', 'APAC', FALSE), + ('MZ', 'Mozambique', 'EMEA', FALSE), + ('NA', 'Namibia', 'EMEA', FALSE), + ('NC', 'New Caledonia', 'APAC', FALSE), + ('NE', 'Niger', 'EMEA', FALSE), + ('NF', 'Norfolk Island', 'APAC', FALSE), + ('NG', 'Nigeria', 'EMEA', FALSE), + ('NI', 'Nicaragua', 'LATAM', FALSE), + ('NL', 'Netherlands', 'EMEA', FALSE), + ('NO', 'Norway', 'EMEA', FALSE), + ('NP', 'Nepal', 'APAC', FALSE), + ('NR', 'Nauru', 'APAC', FALSE), + ('NU', 'Niue', 'APAC', FALSE), + ('NZ', 'New Zealand', 'APAC', FALSE), + ('OM', 'Oman', 'EMEA', FALSE), + ('PA', 'Panama', 'LATAM', FALSE), + ('PE', 'Peru', 'LATAM', FALSE), + ('PF', 'French Polynesia', 'APAC', FALSE), + ('PG', 'Papua New Guinea', 'APAC', FALSE), + ('PH', 'Philippines', 'APAC', FALSE), + ('PK', 'Pakistan', 'APAC', FALSE), + ('PL', 'Poland', 'EMEA', FALSE), + ('PM', 'Saint Pierre and Miquelon', 'NAM', FALSE), + ('PN', 'Pitcairn', 'APAC', FALSE), + ('PR', 'Puerto Rico', 'LATAM', FALSE), + ('PS', 'Palestine', 'EMEA', FALSE), + ('PT', 'Portugal', 'EMEA', FALSE), + ('PW', 'Palau', 'APAC', FALSE), + ('PY', 'Paraguay', 'LATAM', FALSE), + ('QA', 'Qatar', 'EMEA', FALSE), + ('RE', 'Réunion', 'EMEA', FALSE), + ('RO', 'Romania', 'EMEA', FALSE), + ('RS', 'Serbia', 'EMEA', FALSE), + ('RU', 'Russian Federation', 'EMEA', FALSE), + ('RW', 'Rwanda', 'EMEA', FALSE), + ('SA', 'Saudi Arabia', 'EMEA', FALSE), + ('SB', 'Solomon Islands', 'APAC', FALSE), + ('SC', 'Seychelles', 'EMEA', FALSE), + ('SD', 'Sudan', 'EMEA', FALSE), + ('SE', 'Sweden', 'EMEA', FALSE), + ('SG', 'Singapore', 'APAC', FALSE), + ('SH', 'Saint Helena', 'EMEA', FALSE), + ('SI', 'Slovenia', 'EMEA', FALSE), + ('SJ', 'Svalbard and Jan Mayen', 'EMEA', FALSE), + ('SK', 'Slovakia', 'EMEA', FALSE), + ('SL', 'Sierra Leone', 'EMEA', FALSE), + ('SM', 'San Marino', 'EMEA', FALSE), + ('SN', 'Senegal', 'EMEA', FALSE), + ('SO', 'Somalia', 'EMEA', FALSE), + ('SR', 'Suriname', 'LATAM', FALSE), + ('SS', 'South Sudan', 'EMEA', FALSE), + ('ST', 'Sao Tome and Principe', 'EMEA', FALSE), + ('SV', 'El Salvador', 'LATAM', FALSE), + ('SX', 'Sint Maarten', 'LATAM', FALSE), + ('SY', 'Syrian Arab Republic', 'EMEA', FALSE), + ('SZ', 'Eswatini', 'EMEA', FALSE), + ('TC', 'Turks and Caicos Islands', 'LATAM', FALSE), + ('TD', 'Chad', 'EMEA', FALSE), + ('TF', 'French Southern Territories', 'EMEA', FALSE), + ('TG', 'Togo', 'EMEA', FALSE), + ('TH', 'Thailand', 'APAC', FALSE), + ('TJ', 'Tajikistan', 'EMEA', FALSE), + ('TK', 'Tokelau', 'APAC', FALSE), + ('TL', 'Timor-Leste', 'APAC', FALSE), + ('TM', 'Turkmenistan', 'EMEA', FALSE), + ('TN', 'Tunisia', 'EMEA', FALSE), + ('TO', 'Tonga', 'APAC', FALSE), + ('TR', 'Turkey', 'EMEA', FALSE), + ('TT', 'Trinidad and Tobago', 'LATAM', FALSE), + ('TV', 'Tuvalu', 'APAC', FALSE), + ('TW', 'Taiwan', 'APAC', FALSE), + ('TZ', 'Tanzania', 'EMEA', FALSE), + ('UA', 'Ukraine', 'EMEA', FALSE), + ('UG', 'Uganda', 'EMEA', FALSE), + ('UM', 'United States Minor Outlying Islands', 'APAC', FALSE), + ('US', 'United States', 'NAM', FALSE), + ('UY', 'Uruguay', 'LATAM', FALSE), + ('UZ', 'Uzbekistan', 'EMEA', FALSE), + ('VA', 'Vatican City', 'EMEA', FALSE), + ('VC', 'Saint Vincent and the Grenadines', 'LATAM', FALSE), + ('VE', 'Venezuela', 'LATAM', FALSE), + ('VG', 'Virgin Islands, British', 'LATAM', FALSE), + ('VI', 'Virgin Islands, U.S.', 'LATAM', FALSE), + ('VN', 'Viet Nam', 'APAC', FALSE), + ('VU', 'Vanuatu', 'APAC', FALSE), + ('WF', 'Wallis and Futuna', 'APAC', FALSE), + ('WS', 'Samoa', 'APAC', FALSE), + ('YE', 'Yemen', 'EMEA', FALSE), + ('YT', 'Mayotte', 'EMEA', FALSE), + ('ZA', 'South Africa', 'EMEA', FALSE), + ('ZM', 'Zambia', 'EMEA', FALSE), + ('ZW', 'Zimbabwe', 'EMEA', FALSE), + ('XK', 'Kosovo', 'EMEA', FALSE); -- ============================================================================= -- 3. INSERT COUNTRY PROPERTIES