diff --git a/.github/workflows/docker-java-publish.yml b/.github/workflows/docker-java-publish.yml index fc359bd..3a92648 100644 --- a/.github/workflows/docker-java-publish.yml +++ b/.github/workflows/docker-java-publish.yml @@ -2,11 +2,6 @@ name: Docker on: push: - # Publish `main` as Docker `latest` image. - branches: - - main - - # Publish `v1.2.3` tags as releases. tags: - v* @@ -49,6 +44,10 @@ jobs: java-version: "17" distribution: "temurin" + - name: Extract version from Git tag + id: vars + run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV + - name: Build image with jar env: GITHUB_USERNAME: ${{ secrets.G_USERNAME }} @@ -61,5 +60,5 @@ jobs: - name: Push image run: | IMAGE_READY=stelzo/$IMAGE_NAME - docker tag runner/$IMAGE_NAME:1.0-SNAPSHOT $IMAGE_READY:java - docker push $IMAGE_READY:java + docker tag runner/$IMAGE_NAME:1.0-SNAPSHOT $IMAGE_READY:java-${{ env.VERSION }} + docker push $IMAGE_READY:java-${{ env.VERSION }} diff --git a/pom.xml b/pom.xml index b5db849..e1121eb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ almanax 1.0-SNAPSHOT - 0.8.3 + 1.0.0-rc.8 3.13.0 true 17 diff --git a/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java b/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java index 28776c1..a1fb20c 100644 --- a/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java +++ b/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java @@ -48,7 +48,7 @@ @RequestScoped @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -@Path("/dofus2") +@Path("/dofus3") public class OfferingResourceV2 { private OfferingRepository offeringRepository; diff --git a/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java b/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java index 6dde493..13119fb 100644 --- a/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java +++ b/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java @@ -38,7 +38,7 @@ public ItemObjectDTO get(String url, String language) { Integer ankamaId = Integer.parseInt(split[split.length - 1].trim()); String ankamaEnGeneral = "https://www.dofus.com/en/mmorpg/encyclopedia"; ApiClient defaultClient = Configuration.getDefaultApiClient(); - String game = "dofus2"; + String game = "dofus3"; if (url.contains("resources")) { ResourcesApi resourcesApi = new ResourcesApi(defaultClient); @@ -103,7 +103,7 @@ public ItemDTOV2 getV2(String url, String language) { String[] split = url.split("/"); Integer ankamaId = Integer.parseInt(split[split.length - 1].trim()); ApiClient defaultClient = Configuration.getDefaultApiClient(); - String game = "dofus2"; + String game = "dofus3"; if (url.contains("resources")) { try { diff --git a/src/main/java/com/dofusdude/almanax/dto/ImageUrlsDTO.java b/src/main/java/com/dofusdude/almanax/dto/ImageUrlsDTO.java index afc9302..c65ba80 100644 --- a/src/main/java/com/dofusdude/almanax/dto/ImageUrlsDTO.java +++ b/src/main/java/com/dofusdude/almanax/dto/ImageUrlsDTO.java @@ -16,7 +16,7 @@ package com.dofusdude.almanax.dto; -import com.dofusdude.client.model.ImageUrls; +import com.dofusdude.client.model.Images; public class ImageUrlsDTO { /** @@ -47,7 +47,7 @@ public class ImageUrlsDTO { public ImageUrlsDTO() { } - public static ImageUrlsDTO from(ImageUrls imageUrls) { + public static ImageUrlsDTO from(Images imageUrls) { ImageUrlsDTO imageUrlsDTO = new ImageUrlsDTO(); imageUrlsDTO.icon = imageUrls.getIcon(); imageUrlsDTO.sd = imageUrls.getSd(); diff --git a/src/main/java/com/dofusdude/almanax/dto/ItemDTOV2.java b/src/main/java/com/dofusdude/almanax/dto/ItemDTOV2.java index b824c50..05959c9 100644 --- a/src/main/java/com/dofusdude/almanax/dto/ItemDTOV2.java +++ b/src/main/java/com/dofusdude/almanax/dto/ItemDTOV2.java @@ -16,7 +16,7 @@ package com.dofusdude.almanax.dto; -import com.dofusdude.client.model.ImageUrls; +import com.dofusdude.client.model.Images; import jakarta.json.bind.annotation.JsonbProperty; @@ -34,7 +34,7 @@ public class ItemDTOV2 { public ItemDTOV2() { } - public ItemDTOV2(Integer ankamaId, String subtype, String name, ImageUrls image_urls) { + public ItemDTOV2(Integer ankamaId, String subtype, String name, Images image_urls) { this.ankamaId = ankamaId; this.subtype = subtype; this.name = name; diff --git a/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java b/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java index 8c82680..5a3b2ee 100644 --- a/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java +++ b/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java @@ -18,7 +18,7 @@ import com.dofusdude.client.ApiClient; import com.dofusdude.client.Configuration; -import com.dofusdude.client.model.ItemsListEntryTyped; +import com.dofusdude.client.model.ListItemGeneral; import com.dofusdude.client.api.GameApi; import com.dofusdude.almanax.clients.EncObjectSwitch; import com.dofusdude.almanax.dto.CreateOfferingDTO; @@ -141,6 +141,10 @@ private boolean offeringChanged(CreateOfferingDTO newOffering, Offering persiste return true; } + if (!newOffering.itemPicture.equals(persistentOffering.getItem().getPictureUrl())) { + return true; + } + return false; } @@ -179,19 +183,19 @@ public void persist(CreateOfferingDTO offeringDTO, String language, boolean recr GameApi apiInstance = new GameApi(defaultClient); try { - List items = apiInstance.getItemsAllSearch(language, "dofus2", + List items = apiInstance.getItemsAllSearch(language, "dofus3", offeringDTO.item, null, null, null, null); int i = 0; - ItemsListEntryTyped firstItem = items.get(0); - while (i < items.size() && items.get(i).getItemSubtype().equals("quest") + ListItemGeneral firstItem = items.get(0); + while (i < items.size() && items.get(i).getItemSubtype().getNameId().equals("quest") && items.get(i).getName().equals(firstItem.getName())) { i++; } - ItemsListEntryTyped item = items.get(i); - resUrl = defaultClient.getBasePath() + "/dofus2/" + offeringDTO.language + "/items/" + item.getItemSubtype() + ListItemGeneral item = items.get(i); + resUrl = defaultClient.getBasePath() + "/dofus3/v1/" + offeringDTO.language + "/items/" + item.getItemSubtype() + "/" + Integer.toString(item.getAnkamaId()); offeringDTO.itemPicture = item.getImageUrls().getSd() == null ? item.getImageUrls().getIcon()