fix-dependens-on-validation-issue-service-offer-vc-url-replace-with-id

smartSenseSolutions · Jun 13, 2024 · bbbba1b · bbbba1b
1 parent e4d0612
commit bbbba1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/wizard-core/src/main/java/eu/gaiax/wizard/core/service/service_offer/PolicyService.java b/wizard-core/src/main/java/eu/gaiax/wizard/core/service/service_offer/PolicyService.java
@@ -81,7 +81,7 @@ public void hostPolicy(String hostPolicyJson, String hostedPath) {
             FileUtils.writeStringToFile(file, hostPolicyJson, Charset.defaultCharset());
             this.s3Utils.uploadFile(hostedPath, file);
         } catch (Exception e) {
-            log.error("Error while hosting policy json on path " + hostedPath, e);
+									log.error("Error while hosting policy json on path {}", hostedPath, e);
         } finally {
             CommonUtils.deleteFile(file);
         }

diff --git a/...rd-core/src/main/java/eu/gaiax/wizard/core/service/service_offer/ServiceOfferService.java b/...rd-core/src/main/java/eu/gaiax/wizard/core/service/service_offer/ServiceOfferService.java
@@ -110,7 +110,8 @@ public ServiceOfferResponse createServiceOffering(CreateServiceOfferingRequest r
         }
 
         String serviceName = "service_" + this.getRandomString();
-        String serviceHostUrl = this.wizardHost + participant.getId() + "/" + serviceName + ".json";
+
+								String serviceHostUrl = signerService.formServiceOfferingJsonUrl(participant.getDomain(), participant.getId(), serviceName);
 
         Map<String, String> labelLevelVc = this.createServiceOfferLabelLevel(participant, request, serviceHostUrl);
         Map<String, Object> credentialSubject = request.getCredentialSubject();
@@ -122,9 +123,8 @@ public ServiceOfferResponse createServiceOffering(CreateServiceOfferingRequest r
         request.setCredentialSubject(credentialSubject);
 
         Map<String, String> complianceCredential = this.signerService.signService(participant, request, serviceName);
-								String vcUrl=StringUtils.hasText(request.getCredentialSubject().get("id").toString())?request.getCredentialSubject().get("id").toString():serviceHostUrl;
 
-								Credential serviceOffVc = this.credentialService.createCredential(complianceCredential.get(SERVICE_VC), vcUrl, CredentialTypeEnum.SERVICE_OFFER.getCredentialType(), "", participant);
+								Credential serviceOffVc = this.credentialService.createCredential(complianceCredential.get(SERVICE_VC), serviceHostUrl, CredentialTypeEnum.SERVICE_OFFER.getCredentialType(), "", participant);
         List<StandardTypeMaster> supportedStandardList = this.getSupportedStandardList(complianceCredential.get(SERVICE_VC));
 
         ServiceOffer serviceOffer = ServiceOffer.builder()
@@ -140,7 +140,7 @@ public ServiceOfferResponse createServiceOffering(CreateServiceOfferingRequest r
         serviceOffer = this.serviceOfferRepository.save(serviceOffer);
 
         if (!participant.isOwnDidSolution()) {
-            this.signerService.addServiceEndpoint(participant.getId(), vcUrl, this.serviceEndpointConfig.linkDomainType(), vcUrl);
+            this.signerService.addServiceEndpoint(participant.getId(), serviceHostUrl, this.serviceEndpointConfig.linkDomainType(), serviceHostUrl);
         }
 
         this.publishService.publishServiceComplianceToMessagingQueue(serviceOffer.getId(), complianceCredential.get(SERVICE_VC));

diff --git a/wizard-core/src/main/java/eu/gaiax/wizard/core/service/signer/SignerService.java b/wizard-core/src/main/java/eu/gaiax/wizard/core/service/signer/SignerService.java
@@ -173,7 +173,7 @@ private String formParticipantJsonUrl(String domain, UUID participantId) {
         return this.wizardHost + participantId.toString() + "/" + PARTICIPANT_JSON;
     }
 
-    private String formServiceOfferingJsonUrl(String domain, UUID participantId, String name) {
+    public String formServiceOfferingJsonUrl(String domain, UUID participantId, String name) {
         if (StringUtils.hasText(domain)) {
             return "https://" + domain + "/" + participantId.toString() + "/" + name + JSON_EXTENSION;
         }