fix: resolve pull conflicts

lnco-epfl · Dec 17, 2024 · 671972b · 671972b
2 parents c478a2d + d6cacaa
commit 671972b
Show file tree

Hide file tree

Showing 12 changed files with 431 additions and 1,019 deletions.
diff --git a/.aws/graasp-dev.json b/.aws/graasp-dev.json
@@ -22,7 +22,17 @@
       "dependsOn": null,
       "disableNetworking": null,
       "healthCheck": null,
-      "essential": true
+      "essential": true,
+      "links": null,
+      "hostname": null,
+      "extraHosts": null,
+      "pseudoTerminal": null,
+      "user": null,
+      "readonlyRootFilesystem": null,
+      "dockerLabels": null,
+      "systemControls": null,
+      "privileged": null
+      "name": "graasp"
     },
     {
       "dnsSearchDomains": null,

diff --git a/.aws/graasp-prod.json b/.aws/graasp-prod.json
@@ -4,14 +4,14 @@
   "cpu": "2048",
   "memory": "4096",
   "requiresCompatibilities": ["FARGATE"],
+  "requiresCompatibilities": ["FARGATE"],
   "networkMode": "awsvpc",
   "runtimePlatform": {
     "operatingSystemFamily": "LINUX",
     "cpuArchitecture": null
   },
   "containerDefinitions": [
     {
-      "name": "graasp",
       "logConfiguration": {
         "logDriver": "awslogs",
         "options": {
@@ -101,6 +101,16 @@
       "systemControls": null,
       "privileged": null,
       "name": "graasp-iframely-production"
+      "links": null,
+      "hostname": null,
+      "extraHosts": null,
+      "pseudoTerminal": null,
+      "user": null,
+      "readonlyRootFilesystem": null,
+      "dockerLabels": null,
+      "systemControls": null,
+      "privileged": null,
+      "name": "graasp-iframely-production"
     }
   ],
   "placementConstraints": [],
@@ -120,4 +130,21 @@
   "inferenceAccelerators": null,
   "proxyConfiguration": null,
   "volumes": []
+  "placementConstraints": [],
+  "memory": "4096",
+  "taskRoleArn": null,
+  "compatibilities": [],
+  "taskDefinitionArn": null,
+  "family": "graasp",
+  "requiresAttributes": [],
+  "pidMode": null,
+  "requiresCompatibilities": ["FARGATE"],
+  "networkMode": "awsvpc",
+  "runtimePlatform": null,
+  "cpu": "2048",
+  "revision": null,
+  "status": null,
+  "inferenceAccelerators": null,
+  "proxyConfiguration": null,
+  "volumes": []
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/src/services/item/index.ts b/src/services/item/index.ts
@@ -35,7 +35,6 @@ import graaspValidationPlugin from './plugins/publication/validation';
 import graaspRecycledItemData from './plugins/recycled';
 import ShortLinkService from './plugins/shortLink';
 import { SHORT_LINKS_ROUTE_PREFIX } from './plugins/shortLink/service';
-import graaspItemTagPlugin from './plugins/tag/controller';
 import thumbnailsPlugin from './plugins/thumbnail';
 import { itemWsHooks } from './ws/hooks';
 
@@ -113,8 +112,6 @@ const plugin: FastifyPluginAsync = async (fastify) => {
 
         fastify.register(itemGeolocationPlugin);
 
-        fastify.register(graaspItemTagPlugin);
-
         fastify.register(itemController);
       });
     },

diff --git a/src/services/item/plugins/etherpad/controller.ts b/src/services/item/plugins/etherpad/controller.ts
diff --git a/src/services/item/plugins/file/index.ts b/src/services/item/plugins/file/index.ts
@@ -1,7 +1,7 @@
 import { fastifyMultipart } from '@fastify/multipart';
 import { FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox';
 
-import { FileItemProperties, PermissionLevel, getFileExtension } from '@graasp/sdk';
+import { FileItemProperties, PermissionLevel } from '@graasp/sdk';
 
 import { resolveDependency } from '../../../../di/utils';
 import { asDefined } from '../../../../utils/assertions';
@@ -14,8 +14,6 @@ import { StorageService } from '../../../member/plugins/storage/service';
 import { validatedMemberAccountRole } from '../../../member/strategies/validatedMemberAccountRole';
 import { Item } from '../../entities/Item';
 import { ItemService } from '../../service';
-import { H5PService } from '../html/h5p/service';
-import { H5P_FILE_EXTENSION } from '../importExport/constants';
 import { download, upload } from './schema';
 import FileItemService from './service';
 import { DEFAULT_MAX_FILE_SIZE, MAX_NUMBER_OF_FILES_UPLOAD } from './utils/constants';
@@ -36,7 +34,6 @@ const basePlugin: FastifyPluginAsyncTypebox<GraaspPluginFileOptions> = async (fa
   const itemService = resolveDependency(ItemService);
   const storageService = resolveDependency(StorageService);
   const fileItemService = resolveDependency(FileItemService);
-  const h5pService = resolveDependency(H5PService);
 
   fastify.register(fastifyMultipart, {
     limits: {
@@ -139,27 +136,13 @@ const basePlugin: FastifyPluginAsyncTypebox<GraaspPluginFileOptions> = async (fa
           try {
             // if the file is an H5P file, we treat it appropriately
             // othwerwise, we save it as a generic file
-            let item: Item;
-            if (getFileExtension(filename) === H5P_FILE_EXTENSION) {
-              item = await h5pService.createH5PItem(
-                member,
-                repositories,
-                filename,
-                stream,
-                parentId,
-                previousItemId,
-                log,
-              );
-            } else {
-              item = await fileItemService.upload(member, repositories, {
-                parentId,
-                filename,
-                mimetype,
-                stream,
-                previousItemId,
-              });
-            }
-
+            const item = await fileItemService.upload(member, repositories, {
+              parentId,
+              filename,
+              mimetype,
+              stream,
+              previousItemId,
+            });
             items.push(item);
           } catch (e) {
             // ignore errors