Merge pull request #2465 from ideafast/feat/trpc-data

Feat/trpc data
ideafast · Jul 12, 2024 · 1c1e4ca · 1c1e4ca
2 parents 1e5e0c7 + 9c547d8
commit 1c1e4ca
Show file tree

Hide file tree

Showing 26 changed files with 6,163 additions and 497 deletions.
diff --git a/packages/itmat-cores/config/config.sample.json b/packages/itmat-cores/config/config.sample.json
@@ -17,7 +17,9 @@
             "files_collection": "FILES_COLLECTION",
             "sessions_collection": "SESSIONS_COLLECTION",
             "pubkeys_collection": "PUBKEY_COLLECTION",
-            "standardizations_collection": "STANDARDIZATION_COLLECTION"
+            "standardizations_collection": "STANDARDIZATION_COLLECTION",
+            "colddata_collection": "COLDDATA_COLLECTION",
+            "cache_collection": "CACHE_COLLECTION"
         }
     },
     "server": {

diff --git a/packages/itmat-cores/src/GraphQLCore/studyCore.ts b/packages/itmat-cores/src/GraphQLCore/studyCore.ts
@@ -1184,7 +1184,7 @@ export class StudyCore {
                             error = `Field ${dataClip.fieldId}: Cannot parse as decimal.`;
                             break;
                         }
-                        if (!/^\d+(.\d+)?$/.test(dataClip.value)) {
+                        if (!/^-?\d+(\.\d+)?$/.test(dataClip.value)) {
                             error = `Field ${dataClip.fieldId}: Cannot parse as decimal.`;
                             break;
                         }

diff --git a/packages/itmat-cores/src/database/database.ts b/packages/itmat-cores/src/database/database.ts
@@ -1,4 +1,4 @@
-import type { IField, IFile, IJobEntry, ILogEntry, IOrganisation, IProject, IPubkey, IQueryEntry, IRole, IStudy, IUser, IStandardization, IConfig, IData, IDrive } from '@itmat-broker/itmat-types';
+import type { IField, IFile, IJobEntry, ILogEntry, IOrganisation, IProject, IPubkey, IQueryEntry, IRole, IStudy, IUser, IStandardization, IConfig, IData, IDrive, ICache } from '@itmat-broker/itmat-types';
 import { Database as DatabaseBase, IDatabaseBaseConfig } from '@itmat-broker/itmat-commons';
 import type { Collection } from 'mongodb';
 
@@ -18,7 +18,9 @@ export interface IDatabaseConfig extends IDatabaseBaseConfig {
         data_collection: string,
         standardizations_collection: string,
         configs_collection: string,
-        drives_collection: string
+        drives_collection: string,
+        colddata_collection: string,
+        cache_collection: string
     };
 }
 
@@ -37,6 +39,8 @@ export interface IDatabaseCollectionConfig {
     data_collection: Collection<IData>,
     standardizations_collection: Collection<IStandardization>,
     configs_collection: Collection<IConfig>,
-    drives_collection: Collection<IDrive>
+    drives_collection: Collection<IDrive>,
+    colddata_collection: Collection<IData>,
+    cache_collection: Collection<ICache>
 }
 export type DBType = DatabaseBase<IDatabaseBaseConfig, IDatabaseCollectionConfig>;
diff --git a/packages/itmat-cores/src/index.ts b/packages/itmat-cores/src/index.ts
@@ -15,6 +15,8 @@ export * from './trpcCore/driveCore';
 export * from './trpcCore/fileCore';
 export * from './trpcCore/studyCore';
 export * from './trpcCore/userCore';
+export * from './trpcCore/dataCore';
+export * from './trpcCore/transformationCore';
 export * from './trpcCore/permissionCore';
 export * from './rest/fileDownload';
 export * from './authentication/pubkeyAuthentication';