#48 save name of serie

p2m2 · Jun 23, 2024 · 93602af · 93602af
1 parent 918823f
commit 93602af
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/components/ManageSerie.async.vue b/components/ManageSerie.async.vue
@@ -84,7 +84,8 @@ async function sendFile() {
   rDaughterLoading.value = false;
 }
 
-async function submit (event) {
+async function submit (event) { 
+
   // check if we have daughter solution
   if (rDaughterTable.value.length === 0) {
     // TODO: show error message
@@ -109,10 +110,11 @@ async function submit (event) {
     return acc;
   }, {});
 
+  // send serie name and all associated daughter solution 
   $fetch('/api/AddSerie', {
     method: 'POST',
     body: JSON.stringify({
-      nameSerie: nameSerie.value,
+      nameSerie: event.target.elements.nameSerie.value,
       daughterGroup,
     }),
   });
@@ -142,6 +144,7 @@ async function submit (event) {
         <v-card-text>
           <v-text-field
             v-model="nameSerie"
+            name="nameSerie"
             :counter="10"
             :rules="nameRules"
             :label="t('label.nameSerie')"

diff --git a/db/init.sql b/db/init.sql
@@ -128,19 +128,12 @@ CREATE TABLE daughter
 (
   id_series SERIAL REFERENCES series (id) ON DELETE CASCADE,
   id_file SERIAL REFERENCES file (id) ON DELETE CASCADE,
-  PRIMARY KEY (id_series, id_file)
-);
-
-CREATE TABLE dau_metabo
-(
-  id_daughter SERIAL REFERENCES file (id) ON DELETE CASCADE,
-  id_metabo VARCHAR(52) UNIQUE,
+  id_mol VARCHAR(52),
   area FLOAT NOT NULL,
   expected FLOAT NOT NULL,
-  PRIMARY KEY (id_daughter, id_metabo)
+  PRIMARY KEY (id_series, id_file, id_mol)
 );
 
-
 CREATE TABLE ratio
 (
   id_mol VARCHAR(52) UNIQUE,

diff --git a/server/api/AddSerie.post.ts b/server/api/AddSerie.post.ts
@@ -9,43 +9,35 @@ import pg from "pg";
 
 export default defineEventHandler(async (event) => {
     const body = await readBody(event);
-    console.log("body", body);
 
     const client = new pg.Client();
     return client.connect()
         .then(() => {
             return client.query(`
                 INSERT INTO series(name, date_create, id_machine)
-                VALUES ('${body.name}', NOW(), -1)
+                VALUES ('${body.nameSerie}', NOW(), -1)
                 RETURNING id`); // -1 is the default value for id_machine
         })
         .then((respQuery) => {
             if (respQuery.rows.length === 0) {
                 throw new Error("Serie not create");
             }
-            respQuery.rows[0].id;
+            // save each metabolite by daughter solution
             return Promise.all(Object.keys(body.daughterGroup).map(
-                (idFile: string) => {
-                    return client.query(`
-                        INSERT INTO daughter(id_series, id_file)
-                        VALUES (
-                            '${respQuery.rows[0].id}',
-                            '${idFile}')`
-                    )
-                    .then(() => {
-                        return Promise.all(body.daughterGroup[idFile].map(
-                            (metabo) =>
-                                client.query(`
-                                    INSERT INTO dau_metabo(
-                                        id_daughter, id_metabo, area, expected) 
-                                    VALUES (
-                                        '${idFile}',
-                                        '${metabo.nameMeta}',
-                                        '${metabo.area}',
-                                        '${metabo.expectedArea}')`
-                                )
-                        ));
-                    });
+                (idFile: string) => {     
+                    //     
+                    for(const metabo of body.daughterGroup[idFile]){
+                        client.query(`
+                            INSERT INTO daughter(
+                                id_series, id_file, id_mol, area, expected) 
+                            VALUES (
+                                '${respQuery.rows[0].id}',
+                                '${idFile}',
+                                '${metabo.nameMeta}',
+                                '${metabo.area}',
+                                '${metabo.expectedArea}')`
+                        );
+                    }
                 }
             ));
         })