refactor(external iiif url): differentiate between reading and creati…

…ng acc. to the api
dasch-swiss · Aug 5, 2024 · 5f5dc10 · 5f5dc10
1 parent ae730a3
commit 5f5dc10
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -232,6 +232,7 @@ export {
     CreateDocumentFileValue,
     CreateMovingImageFileValue,
     CreateStillImageFileValue,
+    CreateStillImageExternalFileValue,
     CreateTextFileValue,
     CreateArchiveFileValue
 } from "./models/v2/resources/values/create/create-file-value";

diff --git a/src/models/v2/Constants.ts b/src/models/v2/Constants.ts
@@ -129,6 +129,7 @@ export class Constants {
     static StillImageFileValueHasDimX = Constants.KnoraApiV2 + Constants.HashDelimiter + "stillImageFileValueHasDimX";
     static StillImageFileValueHasDimY = Constants.KnoraApiV2 + Constants.HashDelimiter + "stillImageFileValueHasDimY";
     static StillImageFileValueHasIIIFBaseUrl = Constants.KnoraApiV2 + Constants.HashDelimiter + "stillImageFileValueHasIIIFBaseUrl";
+    static FileValueHasExternalUrl = Constants.KnoraApiV2 + Constants.HashDelimiter + "fileValueHasExternalUrl";
     static StillImageFileValueHasExternalUrl = Constants.KnoraApiV2 + Constants.HashDelimiter + "stillImageFileValueHasExternalUrl";
     static AudioFileValueHasDuration = Constants.KnoraApiV2 + Constants.HashDelimiter + "audioFileValueHasDuration";
     static MovingImageFileValueHasDimX = Constants.KnoraApiV2 + Constants.HashDelimiter + "movingImageFileValueHasDimX";

diff --git a/src/models/v2/resources/values/create/create-file-value.ts b/src/models/v2/resources/values/create/create-file-value.ts
@@ -56,6 +56,7 @@ export class CreateStillImageFileValue extends CreateFileValue {
 
     constructor() {
         super(Constants.StillImageFileValue);
+
     }
 
 }
@@ -65,7 +66,8 @@ export class CreateStillImageFileValue extends CreateFileValue {
  */
 @JsonObject("CreateStillImageExternalFileValue")
 export class CreateStillImageExternalFileValue extends CreateFileValue {
-
+    @JsonProperty(Constants.FileValueHasExternalUrl, String, true)
+    externalUrl?: string = "";
     constructor() {
         super(Constants.StillImageExternalFileValue);
     }

diff --git a/src/models/v2/resources/values/read/read-file-value.ts b/src/models/v2/resources/values/read/read-file-value.ts
@@ -87,11 +87,7 @@ export class ReadStillImageFileValue extends ReadFileValue {
  */
 @JsonObject("ReadStillImageExternalFileValue")
 export class ReadStillImageExternalFileValue extends ReadFileValue {
-
-    @JsonProperty(Constants.StillImageFileValueHasIIIFBaseUrl, UriConverter)
-    iiifBaseUrl: string = "";
-
-    @JsonProperty(Constants.StillImageFileValueHasExternalUrl, UriConverter)
+    @JsonProperty(Constants.StillImageFileValueHasExternalUrl, UriConverter, true)
     externalUrl: string = "";
 
 }

diff --git a/src/models/v2/resources/values/update/update-file-value.ts b/src/models/v2/resources/values/update/update-file-value.ts
@@ -67,11 +67,11 @@ export class UpdateStillImageFileValue extends UpdateFileValue {
  */
 @JsonObject("UpdateStillImageExternalFileValue")
 export class UpdateExternalStillImageFileValue extends UpdateFileValue {
-
+    @JsonProperty(Constants.StillImageFileValueHasExternalUrl, String, true)
+    externalUrl?: string = "";
     constructor() {
-        super(Constants.StillImageExternalFileValue);
+        super(Constants.StillImageAbstractFileValue);
     }
-
 }