MARP-1202 Release 1.2.0

Create release 1.2.0

marketplace-build/README.md

@@ -19,6 +19,8 @@ This command should return the ``OK`` code
 * Run ``docker-compose up -d --build`` to start a Marketplace DEV at the local
 
 #### If you already have MongoDB on your local machine with public port `27017`
+* Create a docker network to connect ui > service > mongodb by run ``docker network create marketplace-network``
+
 * Navigate to ``marketplace-build/dev``
 
 * Run ``docker-compose up -d --build`` to start a Marketplace DEV at the local

marketplace-build/config/mongodb/authen-docker-compose.yml

@@ -1,4 +1,4 @@
-name: marketplace-db
+name: marketplace
 
 services:
   mongodb:
@@ -14,6 +14,12 @@ services:
     volumes:
       - mongodata:/data/db
       - ./mongod.conf:/etc/mongod.conf
+    networks:
+      - marketplace-network
 
 volumes:
-  mongodata:
+  mongodata:
+
+networks:
+  marketplace-network:
+    external: true

marketplace-build/config/nginx/dev/nginx.conf

@@ -1,3 +1,6 @@
+user www-data;
+worker_processes auto;
+
 events {}
 
 http {
@@ -24,5 +27,23 @@ http {
             proxy_cache_bypass $http_upgrade;
             proxy_redirect off;
         }
+
+        # Start: Handle for DOCs
+        location /market-cache/ {
+            alias /usr/share/nginx/html/market-cache/;
+            index index.html;
+            try_files $uri $uri/ /index.html;
+        }
+        # End: Handle for DOCs
+
+        # Start: Handle for LIBs
+        # Workaround for static libs. e.g: https://market.axonivy.com/demos-app/dev/lib/ivy-demos-app.zip
+        location ~ ^/([^/]+)/([^/]+)/lib/(.*)$ {
+            alias /usr/share/nginx/html/cache/$1/$2/lib/;
+            try_files $3 =404;
+        }
+        # End: Handle for LIBs
+
+        error_page 403 /error-page;
     }
 }

marketplace-build/config/nginx/nginx.conf

@@ -26,5 +26,23 @@ http {
             proxy_cache_bypass $http_upgrade;
             proxy_redirect off;
         }
+
+        # Start: Handle for DOCs
+        location /market-cache/ {
+            alias /usr/share/nginx/html/market-cache/;
+            index index.html;
+            try_files $uri $uri/ /index.html;
+        }
+        # End: Handle for DOCs
+
+        # Start: Handle for LIBs
+        # Workaround for static libs. e.g: https://market.axonivy.com/demos-app/dev/lib/ivy-demos-app.zip
+        location ~ ^/([^/]+)/([^/]+)/lib/(.*)$ {
+            alias /usr/share/nginx/html/cache/$1/$2/lib/;
+            try_files $3 =404;
+        }
+        # End: Handle for LIBs
+
+        error_page 403 /error-page;
     }
 }

marketplace-build/dev/docker-compose.yml

@@ -13,16 +13,20 @@ services:
     restart: always
     volumes:
       - ../../marketplace-build/config/nginx/dev/nginx.conf:/etc/nginx/nginx.conf
+      - marketcache:/usr/share/nginx/html/market-cache
     ports:
       - "4200:80"
     depends_on:
       - service
+    networks:
+      - marketplace-network
 
   service:
     container_name: marketplace-service
     restart: always
     volumes:
-      - /home/axonivy/marketplace/data/market-installations.json:/data/market-installation.json
+      - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json
+      - marketcache:/app/data/market-cache
     environment:
       - MONGODB_HOST=${SERVICE_MONGODB_HOST}
       - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE}
@@ -42,3 +46,12 @@ services:
         - BUILD_VERSION=${BUILD_VERSION}
     ports:
       - "8080:8080"
+    networks:
+      - marketplace-network
+
+volumes:
+  marketcache:
+
+networks:
+  marketplace-network:
+    external: true

marketplace-build/docker-compose.yml

@@ -28,6 +28,7 @@ services:
     restart: always
     volumes:
       - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - marketcache:/usr/share/nginx/html/market-cache
     ports:
       - "4200:80"
     depends_on:
@@ -37,7 +38,8 @@ services:
     container_name: marketplace-service
     restart: always
     volumes:
-      - /home/axonivy/marketplace/data/market-installations.json:/data/market-installation.json
+      - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json
+      - marketcache:/app/data/market-cache
     environment:
       - MONGODB_HOST=${SERVICE_MONGODB_HOST}
       - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE}
@@ -62,3 +64,4 @@ services:
 
 volumes:
   mongodata:
+  marketcache:

marketplace-build/release/docker-compose.yml

@@ -19,6 +19,7 @@ services:
     image: ghcr.io/axonivy-market/marketplace-ui:${RELEASE_VERSION}
     volumes:
       - ../config/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - marketcache:/usr/share/nginx/html/market-cache
     restart: always
     ports:
       - "80:80"
@@ -29,7 +30,8 @@ services:
     expose:
       - 8080
     volumes:
-      - /home/axonivy/marketplace/data/market-installations.json:/data/market-installation.json
+      - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json
+      - marketcache:/app/data/market-cache
     environment:
       - MONGODB_HOST=${SERVICE_MONGODB_HOST}
       - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE}
@@ -43,4 +45,5 @@ services:
       - MARKET_CORS_ALLOWED_ORIGIN=${MARKET_CORS_ALLOWED_ORIGIN}
       - MARKET_MONGO_LOG_LEVEL=${MARKET_MONGO_LOG_LEVEL}
 volumes:
-  mongodata:
+  mongodata:
+  marketcache:

marketplace-service/.dockerignore

@@ -1,5 +1,6 @@
 target/
 data/
+unzip/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

marketplace-service/.gitignore

@@ -1,5 +1,6 @@
 target/
 data/
+unzip/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

marketplace-service/src/main/java/com/axonivy/market/MarketplaceServiceApplication.java

@@ -1,8 +1,10 @@
 package com.axonivy.market;
 
+import com.axonivy.market.service.ExternalDocumentService;
 import com.axonivy.market.service.ProductService;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,14 +14,17 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.List;
+
 @Log4j2
 @EnableAsync
 @EnableScheduling
 @SpringBootApplication
 @AllArgsConstructor
 public class MarketplaceServiceApplication {
 
-  private final ProductService productService;
+  final ProductService productService;
+  final ExternalDocumentService externalDocumentService;
 
   public static void main(String[] args) {
     SpringApplication.run(MarketplaceServiceApplication.class, args);
@@ -28,19 +33,36 @@ public static void main(String[] args) {
   @Async
   @EventListener(ApplicationStartedEvent.class)
   public void startInitializeSystem() {
-    syncProductData();
+    List<String> productIds = syncProductData();
+    syncExternalDocumentData(productIds);
   }
 
-  private void syncProductData() {
+  private List<String> syncProductData() {
     var watch = new StopWatch();
     log.warn("Synchronizing Market repo: Started synchronizing data for Axon Ivy Market repo");
     watch.start();
-    if (productService.syncLatestDataFromMarketRepo()) {
-      log.warn("Synchronizing Market repo: Data is already up to date");
+    List<String> syncedProductIds = productService.syncLatestDataFromMarketRepo();
+    if (ObjectUtils.isEmpty(syncedProductIds)) {
+      log.warn("Synchronizing Market repo: Nothing updated");
     } else {
       watch.stop();
       log.warn("Synchronizing Market repo: Finished synchronizing data for Axon Ivy Market repo in [{}] milliseconds",
           watch.getTime());
+      log.warn("Synchronizing Market repo: Synced products [{}]", syncedProductIds);
+    }
+    return syncedProductIds;
+  }
+
+  private void syncExternalDocumentData(List<String> productIds) {
+    var watch = new StopWatch();
+    log.warn("Synchronizing External Document: Started synchronizing data for Document");
+    watch.start();
+    if (ObjectUtils.isEmpty(productIds)) {
+      log.warn("Synchronizing External Document: Nothing updated");
     }
+    productIds.forEach(id -> externalDocumentService.syncDocumentForProduct(id, false));
+    watch.stop();
+    log.warn("Synchronizing External Document: Finished synchronizing data for Document in [{}] milliseconds",
+        watch.getTime());
   }
 }

marketplace-service/src/main/java/com/axonivy/market/assembler/ProductDetailModelAssembler.java

@@ -5,7 +5,6 @@
 import com.axonivy.market.entity.Product;
 import com.axonivy.market.model.ProductDetailModel;
 import com.axonivy.market.util.ImageUtils;
-import com.axonivy.market.util.VersionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport;
@@ -58,7 +57,7 @@ private ProductDetailModel createModel(Product product, String version, String r
           methodOn(ProductDetailsController.class).findBestMatchProductDetailsByVersion(productId, version);
       case RequestMappingConstants.BY_ID_AND_VERSION ->
           methodOn(ProductDetailsController.class).findProductDetailsByVersion(productId, version);
-      default -> methodOn(ProductDetailsController.class).findProductDetails(productId);
+      default -> methodOn(ProductDetailsController.class).findProductDetails(productId, false);
     };
 
     model.add(linkTo(selfLinkWithTag).withSelfRel());

marketplace-service/src/main/java/com/axonivy/market/assembler/ProductModelAssembler.java

@@ -21,7 +21,7 @@ public ProductModelAssembler() {
   @Override
   public ProductModel toModel(Product product) {
     ProductModel resource = new ProductModel();
-    resource.add(linkTo(methodOn(ProductDetailsController.class).findProductDetails(product.getId())).withSelfRel());
+    resource.add(linkTo(methodOn(ProductDetailsController.class).findProductDetails(product.getId(),false)).withSelfRel());
     return createResource(resource, product);
   }
 

marketplace-service/src/main/java/com/axonivy/market/bo/Artifact.java

@@ -2,10 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 import java.io.Serial;
@@ -15,6 +12,7 @@
 
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -31,6 +29,7 @@ public class Artifact implements Serializable {
   @Transient
   private Boolean isProductArtifact;
   private List<ArchivedArtifact> archivedArtifacts;
+  private Boolean doc;
   private boolean isInvalidArtifact;
 
   @Override

marketplace-service/src/main/java/com/axonivy/market/constants/DirectoryConstants.java

@@ -7,5 +7,5 @@
 public class DirectoryConstants {
   public static final String DATA_DIR = "data";
   public static final String WORK_DIR = "work";
-
-}
+  public static final String CACHE_DIR = "market-cache";
+}

marketplace-service/src/main/java/com/axonivy/market/constants/EntityConstants.java

@@ -17,4 +17,5 @@ public class EntityConstants {
   public static final String PRODUCT_MODULE_CONTENT = "ProductModuleContent";
   public static final String IMAGE = "Image";
   public static final String MAVEN_ARTIFACT_VERSION = "MavenArtifactVersion";
+  public static final String EXTERNAL_DOCUMENT_META = "ExternalDocumentMeta";
 }

marketplace-service/src/main/java/com/axonivy/market/constants/MavenConstants.java

@@ -4,6 +4,7 @@ public class MavenConstants {
   public static final String SNAPSHOT_VERSION = "SNAPSHOT";
   public static final String SNAPSHOT_RELEASE_POSTFIX = "-" + SNAPSHOT_VERSION;
   public static final String SPRINT_RELEASE_POSTFIX = "-m";
+  public static final String DEV_RELEASE_POSTFIX = "-dev";
   public static final String PRODUCT_ARTIFACT_POSTFIX = "-product";
   public static final String DEFAULT_IVY_MAVEN_BASE_URL = "https://maven.axonivy.com";
   public static final String ARTIFACT_FILE_NAME_FORMAT = "%s-%s.%s";

marketplace-service/src/main/java/com/axonivy/market/constants/MongoDBConstants.java

@@ -1,7 +1,10 @@
 package com.axonivy.market.constants;
 
-public class MongoDBConstants {
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MongoDBConstants {
   public static final String ID = "_id";
   public static final String PRODUCT_COLLECTION = "Product";
   public static final String INSTALLATION_COUNT = "InstallationCount";
@@ -13,7 +16,5 @@ public class MongoDBConstants {
   public static final String RELEASED_VERSIONS = "releasedVersions";
   public static final String ARTIFACTS = "artifacts";
   public static final String MAVEN_VERSIONS = "mavenVersions";
-  private MongoDBConstants() {
-  }
-
+  public static final String ARTIFACTS_DOC = "artifacts.doc";
 }

marketplace-service/src/main/java/com/axonivy/market/constants/RequestMappingConstants.java

@@ -28,4 +28,5 @@ public class RequestMappingConstants {
   public static final String VERSIONS_IN_DESIGNER = "/{id}/designerversions";
   public static final String DESIGNER_INSTALLATION_BY_ID = "/installation/{id}/designer";
   public static final String CUSTOM_SORT = "custom-sort";
+  public static final String EXTERNAL_DOCUMENT = API + "/externaldocument";
 }