From dfa245e842a87e430bdcd0a33074696944b6a489 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Sun, 12 May 2024 11:58:36 +0200
Subject: [PATCH] [DEV] update with new model

---
 back/pom.xml                                        |  7 ++++++-
 back/src/org/kar/karideo/api/MediaResource.java     |  4 ++--
 .../org/kar/karideo/migration/Initialization.java   | 10 +++-------
 front/src/app/back-api/data-resource.ts             | 13 ++++++-------
 front/src/app/back-api/media-resource.ts            |  3 +--
 front/src/app/back-api/model.ts                     |  2 +-
 front/src/app/back-api/rest-tools.ts                |  8 ++++++--
 front/src/app/back-api/season-resource.ts           |  3 +--
 front/src/app/back-api/series-resource.ts           |  3 +--
 front/src/app/back-api/type-resource.ts             |  3 +--
 .../app/back-api/user-media-advancement-resource.ts |  3 +--
 front/src/app/back-api/user-resource.ts             |  2 +-
 front/tsconfig.json                                 |  8 ++++----
 13 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/back/pom.xml b/back/pom.xml
index b4e6689..b64a289 100644
--- a/back/pom.xml
+++ b/back/pom.xml
@@ -20,13 +20,18 @@
 		<dependency>
 			<groupId>kangaroo-and-rabbit</groupId>
 			<artifactId>archidata</artifactId>
-			<version>0.7.3</version>
+			<version>0.8.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>2.0.9</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.16.1</version>
+		</dependency>
 		<!--
 		************************************************************ 
 		** TEST dependency                                        **
diff --git a/back/src/org/kar/karideo/api/MediaResource.java b/back/src/org/kar/karideo/api/MediaResource.java
index 82699a6..3432a27 100644
--- a/back/src/org/kar/karideo/api/MediaResource.java
+++ b/back/src/org/kar/karideo/api/MediaResource.java
@@ -139,7 +139,7 @@ public class MediaResource {
 			} else if (data!= null && data.deleted != null && data.deleted) {
 				LOGGER.info("Data already exist but deleted");
 				System.out.flush();
-				DataTools.undelete(data.id);
+				DataTools.undelete(data.uuid);
 				data.deleted = false;
 			} else {
 				LOGGER.info("Data already exist ... all good");
@@ -179,7 +179,7 @@ public class MediaResource {
 			try {
 				final Media media = new Media();
 				media.name = title;
-				media.dataId = data.id;
+				media.dataId = data.uuid;
 				media.typeId = typeNode.id;
 				media.seriesId = null;
 				if (seriesNode != null) {
diff --git a/back/src/org/kar/karideo/migration/Initialization.java b/back/src/org/kar/karideo/migration/Initialization.java
index a2eef33..9ea17ea 100644
--- a/back/src/org/kar/karideo/migration/Initialization.java
+++ b/back/src/org/kar/karideo/migration/Initialization.java
@@ -27,13 +27,9 @@ public class Initialization extends MigrationSqlStep {
 
 	@Override
 	public void generateStep() throws Exception {
-		addClass(Data.class);
-		addClass(Media.class);
-		addClass(Type.class);
-		addClass(Series.class);
-		addClass(Season.class);
-		addClass(User.class);
-		addClass(UserMediaAdvancement.class);
+		for(final Class<?> clazz : CLASSES_BASE) {
+			addClass(clazz);
+		}
 
 		addAction("""
 				INSERT INTO `type` (`id`, `name`, `description`) VALUES
diff --git a/front/src/app/back-api/data-resource.ts b/front/src/app/back-api/data-resource.ts
index df18ebc..c68f8d1 100644
--- a/front/src/app/back-api/data-resource.ts
+++ b/front/src/app/back-api/data-resource.ts
@@ -33,7 +33,6 @@ export namespace DataResource {
 				endPoint: "/data//upload/",
 				requestType: HTTPRequestModel.POST,
 				contentType: HTTPMimeType.MULTIPART,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			data,
@@ -54,13 +53,13 @@ export namespace DataResource {
 			Authorization?: string,
 		},
 		params: {
-			id: UUID,
+			uuid: UUID,
 		},
 		data: string,
 	}): Promise<void> {
 		return RESTRequestVoid({
 			restModel: {
-				endPoint: "/data/{id}",
+				endPoint: "/data/{uuid}",
 				requestType: HTTPRequestModel.GET,
 			},
 			restConfig,
@@ -84,13 +83,13 @@ export namespace DataResource {
 			Authorization?: string,
 		},
 		params: {
-			id: UUID,
+			uuid: UUID,
 		},
 		data: string,
 	}): Promise<void> {
 		return RESTRequestVoid({
 			restModel: {
-				endPoint: "/data/thumbnail/{id}",
+				endPoint: "/data/thumbnail/{uuid}",
 				requestType: HTTPRequestModel.GET,
 			},
 			restConfig,
@@ -115,13 +114,13 @@ export namespace DataResource {
 		},
 		params: {
 			name: string,
-			id: UUID,
+			uuid: UUID,
 		},
 		data: string,
 	}): Promise<void> {
 		return RESTRequestVoid({
 			restModel: {
-				endPoint: "/data/{id}/{name}",
+				endPoint: "/data/{uuid}/{name}",
 				requestType: HTTPRequestModel.GET,
 			},
 			restConfig,
diff --git a/front/src/app/back-api/media-resource.ts b/front/src/app/back-api/media-resource.ts
index 2006044..52429f4 100644
--- a/front/src/app/back-api/media-resource.ts
+++ b/front/src/app/back-api/media-resource.ts
@@ -12,8 +12,8 @@ import {
   RESTRequestVoid
 } from "./rest-tools"
 import {
-  Media,
   Long,
+  Media,
   UUID,
   isMedia,
 } from "./model"
@@ -36,7 +36,6 @@ export namespace MediaResource {
 				endPoint: "/media/{id}",
 				requestType: HTTPRequestModel.DELETE,
 				contentType: HTTPMimeType.TEXT_PLAIN,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			params,
diff --git a/front/src/app/back-api/model.ts b/front/src/app/back-api/model.ts
index 0a0406b..c295306 100644
--- a/front/src/app/back-api/model.ts
+++ b/front/src/app/back-api/model.ts
@@ -383,7 +383,7 @@ export function isMedia(data: any): data is Media {
 
 export const ZodUUIDGenericData = ZodGenericTiming.extend({
 	// Unique UUID of the object
-	id: ZodUUID.readonly().optional()
+	uuid: ZodUUID.readonly().optional()
 });
 export type UUIDGenericData = zod.infer<typeof ZodUUIDGenericData>;
 export function isUUIDGenericData(data: any): data is UUIDGenericData {
diff --git a/front/src/app/back-api/rest-tools.ts b/front/src/app/back-api/rest-tools.ts
index d818f57..f2e8437 100644
--- a/front/src/app/back-api/rest-tools.ts
+++ b/front/src/app/back-api/rest-tools.ts
@@ -95,6 +95,10 @@ export interface RESTRequestType {
     callback?: RESTCallbacks,
 };
 
+function replaceAll(input, searchValue, replaceValue) {
+  return input.split(searchValue).join(replaceValue);
+}
+
 function removeTrailingSlashes(input: string): string {
     if (isNullOrUndefined(input)) {
         return "undefined";
@@ -113,7 +117,7 @@ export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestT
     let generateUrl = `${removeTrailingSlashes(restConfig.server)}/${removeLeadingSlashes(restModel.endPoint)}`;
     if (params !== undefined) {
         for (let key of Object.keys(params)) {
-            generateUrl = generateUrl.replaceAll(`{${key}}`, `${params[key]}`);
+            generateUrl = replaceAll(generateUrl, `{${key}}`, `${params[key]}`);
         }
     }
     if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) {
@@ -199,7 +203,7 @@ export function fetchProgress(generateUrl: string, { method, headers, body }: {
                 status: xhr.io.status,
                 statusText: xhr.io.statusText
             });
-            const headersArray = xhr.io.getAllResponseHeaders().trim().replaceAll("\r\n", "\n").split('\n');
+            const headersArray = replaceAll(xhr.io.getAllResponseHeaders().trim(), "\r\n", "\n").split('\n');
             headersArray.forEach(function (header) {
                 const firstColonIndex = header.indexOf(':');
                 if (firstColonIndex !== -1) {
diff --git a/front/src/app/back-api/season-resource.ts b/front/src/app/back-api/season-resource.ts
index d42eb8c..edc5a20 100644
--- a/front/src/app/back-api/season-resource.ts
+++ b/front/src/app/back-api/season-resource.ts
@@ -13,8 +13,8 @@ import {
 } from "./rest-tools"
 import {
   Long,
-  UUID,
   Season,
+  UUID,
   isSeason,
 } from "./model"
 export namespace SeasonResource {
@@ -36,7 +36,6 @@ export namespace SeasonResource {
 				endPoint: "/season/{id}",
 				requestType: HTTPRequestModel.DELETE,
 				contentType: HTTPMimeType.TEXT_PLAIN,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			params,
diff --git a/front/src/app/back-api/series-resource.ts b/front/src/app/back-api/series-resource.ts
index ecccc19..3f8bb54 100644
--- a/front/src/app/back-api/series-resource.ts
+++ b/front/src/app/back-api/series-resource.ts
@@ -13,8 +13,8 @@ import {
 } from "./rest-tools"
 import {
   Long,
-  UUID,
   Series,
+  UUID,
   isSeries,
 } from "./model"
 export namespace SeriesResource {
@@ -36,7 +36,6 @@ export namespace SeriesResource {
 				endPoint: "/series/{id}",
 				requestType: HTTPRequestModel.DELETE,
 				contentType: HTTPMimeType.TEXT_PLAIN,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			params,
diff --git a/front/src/app/back-api/type-resource.ts b/front/src/app/back-api/type-resource.ts
index 784a0b2..b701240 100644
--- a/front/src/app/back-api/type-resource.ts
+++ b/front/src/app/back-api/type-resource.ts
@@ -12,8 +12,8 @@ import {
   RESTRequestVoid
 } from "./rest-tools"
 import {
-  Type,
   Long,
+  Type,
   UUID,
   isType,
 } from "./model"
@@ -36,7 +36,6 @@ export namespace TypeResource {
 				endPoint: "/type/{id}",
 				requestType: HTTPRequestModel.DELETE,
 				contentType: HTTPMimeType.TEXT_PLAIN,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			params,
diff --git a/front/src/app/back-api/user-media-advancement-resource.ts b/front/src/app/back-api/user-media-advancement-resource.ts
index e601d43..da8c717 100644
--- a/front/src/app/back-api/user-media-advancement-resource.ts
+++ b/front/src/app/back-api/user-media-advancement-resource.ts
@@ -12,8 +12,8 @@ import {
   RESTRequestVoid
 } from "./rest-tools"
 import {
-  MediaInformationsDelta,
   Long,
+  MediaInformationsDelta,
   UserMediaAdvancement,
   isUserMediaAdvancement,
 } from "./model"
@@ -36,7 +36,6 @@ export namespace UserMediaAdvancementResource {
 				endPoint: "/advancement/{id}",
 				requestType: HTTPRequestModel.DELETE,
 				contentType: HTTPMimeType.TEXT_PLAIN,
-				accept: HTTPMimeType.JSON,
 			},
 			restConfig,
 			params,
diff --git a/front/src/app/back-api/user-resource.ts b/front/src/app/back-api/user-resource.ts
index dd36b40..dc44147 100644
--- a/front/src/app/back-api/user-resource.ts
+++ b/front/src/app/back-api/user-resource.ts
@@ -12,8 +12,8 @@ import {
   RESTRequestVoid
 } from "./rest-tools"
 import {
-  UserKarideo,
   Long,
+  UserKarideo,
   UserOut,
   isUserKarideo,
   isUserOut,
diff --git a/front/tsconfig.json b/front/tsconfig.json
index 9f81df0..b6bc2fa 100644
--- a/front/tsconfig.json
+++ b/front/tsconfig.json
@@ -9,15 +9,15 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "ES2022",
+    "target": "ES2018",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
-      "ES2022",
+      "ES2018",
       "dom"
     ],
-    "module": "ES2022",
+    "module": "ES2020",
     "baseUrl": "./src",
     "paths": {
       "@app/*": [
@@ -36,4 +36,4 @@
       "defer"
     ]
   }
-}
+}
\ No newline at end of file