#151 into [email protected] 🧊 add orm in interceptor #171

debabin · 2024-05-26T10:44:02Z

No description provided.

MiaInturi · 2024-06-02T09:08:43Z

Думаю надо добавить еще тесты (а то уже есть баги с findIndexById) и README обновить

MiaInturi

qwe

MiaInturi · 2024-06-02T07:22:16Z

.eslintrc.js

@@ -7,6 +7,7 @@ module.exports = {
    {
      files: ['*.ts'],
      rules: {
+        '@typescript-eslint/no-namespace': 'off',


'@typescript-eslint/no-namespace': ['error', { allowDeclarations: true }] - я думаю лучше сделать так, чтобы минимально снять ограничения, а не полностью отключать правило

MiaInturi · 2024-06-02T07:23:45Z

package.json

@@ -35,7 +35,7 @@
    "dist"
  ],
  "engines": {
-    "node": ">=12"
+    "node": ">=10"


А почему версию снизили? Как минимум esbuild, который у нас в dependencies имеет минимальную поддерживаемую версию 12

MiaInturi · 2024-06-02T07:25:15Z

src/core/database/createDatabaseRoutes/storages/File/FileStorage.ts

+export class FileStorage<T extends Record<StorageIndex, any> = Record<StorageIndex, any>>
+  implements Storage


Давай тут тогда дженерик тип T тоже в Data переименуем

MiaInturi · 2024-06-02T07:37:01Z

src/core/middlewares/contextMiddleware/contextMiddleware.ts

У Сереги примерно такая же middleware есть в PR логгера. Думаю можно в одну объединить ваши решения

MiaInturi · 2024-06-02T07:41:21Z

src/utils/types/database.ts

+export type Orm<Database extends Record<string, unknown>> = {
+  [Key in keyof Database]: Database[Key] extends Array<infer Item>
+    ? Item extends { id: string | number }
+      ? NestedOrm<Item>
+      : ShallowOrm<Item>
+    : ShallowOrm<Database[Key]>;
+};


Можно сделать Item extends { id: StorageIndex }

Если Item extends { id: string | number } = false, то надо делать ShallowOrm<Database[Key]>, потому что в качестве shallow database объекта должен рассматриваться массив целиком, а не его элемент(-ы)

MiaInturi · 2024-06-02T09:00:39Z

src/core/database/createOrm/createOrm.ts

+        delete: (id) => storage.delete([key, id]),
+        update: (id, data) => {
+          const currentResource = storage.read([key, id]);
+          const updatedResource = { ...data, id: currentResource.id };
+          storage.write([key, id], updatedResource);
+        },


Тут надо еще вызывать функцию findIndexById как в createNestedDatabaseRoutes

MiaInturi · 2024-06-02T09:02:52Z

src/core/database/createOrm/createOrm.ts

+        delete: (id) => storage.delete([key, id]),
+        update: (id, data) => {
+          const currentResource = storage.read([key, id]);
+          const updatedResource = { ...data, id: currentResource.id };
+          storage.write([key, id], updatedResource);
+        },
+        create: (data) => {
+          const collection = storage.read(key);
+          const newResourceId = createNewId(collection);
+          const newResource = { ...data, id: newResourceId };
+          storage.write([key, value.length], newResource);
+        },
+        createMany: (data) =>
+          data.forEach((element) => {
+            const collection = storage.read(key);
+            const newResourceId = createNewId(collection);
+            const newResource = { ...element, id: newResourceId };
+            storage.write([key, value.length], newResource);
+          }),
+        deleteMany: (ids) =>
+          ids.forEach((id) => {
+            storage.delete([key, id]);
+          }),
+        updateMany: (ids, data) =>
+          ids.forEach((id) => {
+            const currentResource = storage.read([key, id]);
+            const updatedResource = { ...data, id: currentResource.id };
+            storage.write([key, id], updatedResource);
+          })


Хочется жестко структуризировать одним из двух вариантов:

create рядом с createMany и тд

create -> update -> delete -> createMany -> updateMany -> deleteMany

MiaInturi · 2024-06-02T09:03:42Z

src/core/database/createOrm/createOrm.ts

+    (orm, [key, value]) => {
+      orm[key] = {
+        get: () => value,
+        update: (data) => storage.write([key], data)


первый агрумент storage.write необязательно массив - может быть просто key

MiaInturi · 2024-06-02T09:06:14Z

src/utils/types/database.ts

+
+  create: (data: Omit<Item, 'id'>) => void;
+  update: (id: StorageIndex, data: Partial<Omit<Item, 'id'>>) => void;
+  delete: (id: string) => void;


string => StorageIndex

MiaInturi · 2024-06-02T09:07:40Z

src/utils/types/interceptors.ts

@@ -8,6 +10,7 @@ export interface RequestInterceptorParams {
  getCookie: (name: string) => RequestInterceptorCookieValue;
  getHeader: (field: string) => RequestInterceptorHeaderValue;
  getHeaders: () => Record<string, RequestInterceptorHeaderValue>;
+  orm: Orm<Database>;


orm может быть undefined

RiceWithMeat · 2024-06-12T10:51:28Z

src/core/database/createOrm/createOrm.ts

+        createMany: (data) =>
+          data.forEach((element) => {
+            const collection = storage.read(key);
+            const newResourceId = createNewId(collection);
+            const newResource = { ...element, id: newResourceId };
+            storage.write([key, value.length], newResource);
+          }),
+        deleteMany: (ids) =>
+          ids.forEach((id) => {
+            storage.delete([key, id]);
+          }),
+        updateMany: (ids, data) =>


у createMany аргумент не во множественном числе как ниже у deleteMany и updateMany. datas или dataArray можно обозвать

debabin added 2 commits February 5, 2024 13:21

☄ test

cc8d11c

#151 🧊 add orm in interceptor

e544dc4

MiaInturi requested changes Jun 2, 2024

View reviewed changes

RiceWithMeat reviewed Jun 12, 2024

View reviewed changes

MiaInturi linked an issue Jul 1, 2024 that may be closed by this pull request

Get database orm in interceptor #151

Open

MiaInturi added enhancement New feature or request [email protected] issues for [email protected] labels Jul 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#151 into [email protected] 🧊 add orm in interceptor #171

#151 into [email protected] 🧊 add orm in interceptor #171

debabin commented May 26, 2024

MiaInturi commented Jun 2, 2024

MiaInturi left a comment

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

MiaInturi Jun 2, 2024

RiceWithMeat Jun 12, 2024

		export class FileStorage<T extends Record<StorageIndex, any> = Record<StorageIndex, any>>
		implements Storage

#151 into [email protected] 🧊 add orm in interceptor #171

Are you sure you want to change the base?

#151 into [email protected] 🧊 add orm in interceptor #171

Conversation

debabin commented May 26, 2024

MiaInturi commented Jun 2, 2024

MiaInturi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment