fix creazione nuovo degree

Author: paolini

api/controllers/ModelController.js

@@ -88,7 +88,7 @@ function queryFieldsToPipeline(query={}, fields={}) {
             match: {$literal: $match},
         }},
     ]
-    console.log(`queryFieldsToPipeline ${JSON.stringify(query)} => ${JSON.stringify(pipeline)}`)
+    // console.log(`queryFieldsToPipeline ${JSON.stringify(query)} => ${JSON.stringify(pipeline)}`)
     return pipeline
 }
 
@@ -106,7 +106,8 @@ const ModelController = {
         // vengono serializzati correttamente:
         // gli ObjectId sembrano stringhe,
         // le RegExp sembrano oggetti vuoti
-        console.log(`${Model.modelName}.index PIPELINE ${JSON.stringify(pipeline)}`)
+        //
+        // console.log(`${Model.modelName}.index PIPELINE ${JSON.stringify(pipeline)}`)
 
         const [ res ] = await Model.aggregate(pipeline)
 
@@ -131,14 +132,17 @@ const ModelController = {
             if (empty) obj._id = undefined
             return obj
         } catch(err) {
-            console.log(`not found ${id}`)
-            throw new NotFoundError()
+            if (err instanceof mongoose.Error.NotFoundError) {
+                console.log(`not found ${id}`)
+                throw new NotFoundError()
+            }
+            throw err
         }
     },
 
     patch: async (Model, id, data) => {
         try {
-            console.log(`ModelController.patch ${id} ${JSON.stringify(data)}`)
+            console.log(`ModelController.patch ${Model.modelName} ${id} ${JSON.stringify(data)}`)
             await Model.findByIdAndUpdate(id, data, { runValidators: true })
             return {ok: true}
         } catch(err) {

api/models/Degree.js

@@ -27,7 +27,8 @@ const Degree = mongoose.model('Degree', {
                     type: mongoose.Schema.Types.ObjectId,
                     ref: Exam
                 }
-            ]
+            ],
+        default: () => new Map()
     },
     enabled: {
         type: Boolean,

frontend/src/pages/DegreePage.tsx

@@ -126,8 +126,8 @@ export default function DegreePage() {
             <table className="table">
                 <tbody>
                     <tr>
-                        <th>scelta libera</th>
-                        <td> { `gruppo ${degree.default_group}` || "tutti gli esami" } </td>
+                        <th><i>scelta libera</i></th>
+                        <td> { degree.default_group ? `gruppo ${degree.default_group}` : <i>tutti gli esami</i> } </td>
                     </tr>
                     { Object.entries(degree.groups).map(([name, exams]) => 
                         <ExamGroup key={ name } name={ name } exam_ids={ exams }/>)}
@@ -186,16 +186,19 @@ type ExamGroup = {
 }
 
 function DegreeForm({mutate, degree, exams}) {
+    const current_year = new Date().getFullYear()
     const [error, setError] = useState<string>('')
-    const [data, setData] = useState(degree)
+    const [data, setData] = useState({
+        academic_year: current_year,
+        years: 3,
+        ...degree})
     const [groups, setGroups] = useState<ExamGroup[]>(Object.entries(degree.groups as Record<string,string[]>)
         .map(([name,exam_ids])=>({name, exam_ids}))
         .sort((a, b) => a.name.localeCompare(b.name))
     )
     const [validation, setValidation] = useState<any>({})
     const engine = useEngine()
     const navigate = useNavigate()
-    const current_year = new Date().getFullYear()
 
     return <Card>
         {error && <div className="alert alert-danger">{error}</div>}
@@ -212,15 +215,15 @@ function DegreeForm({mutate, degree, exams}) {
             controlId="academic_year"
             label="Anno accademico (solo anno di inizio)"
             type="number"
-            value={data.academic_year || current_year}
+            value={data.academic_year}
             onChange={onChange("academic_year")}
         />
         <Group 
             validationError={validation.years}
             controlId="years"
             label="Anni"
             type="number"
-            value={data.years || 3}
+            value={data.years}
             onChange={onChange("years")}
         />
         <Group
@@ -343,10 +346,17 @@ function DegreeForm({mutate, degree, exams}) {
     }
 
     function submit() {
-        data.groups = Object.fromEntries(groups.map(group => [group.name, group.exam_ids]))
-        data.academic_year = parseInt(data.academic_year)
-        data.years = parseInt(data.years)
-        mutate(data,
+        const groups_array = Object.fromEntries(groups.map(group => [group.name, group.exam_ids]))
+        const academic_year = parseInt(data.academic_year)
+        const years = parseInt(data.years)
+        const payload = {
+            ...data,
+            academic_year,
+            years,
+            groups: groups_array,
+        }
+        console.log(`submitting`, JSON.stringify({payload,data,degree}, null, 2))
+        mutate(payload,
             {
                 onSuccess: (res) => {
                     const id = degree._id || res.data
@@ -355,6 +365,7 @@ function DegreeForm({mutate, degree, exams}) {
                 onError: (err) => {
                     if (err.response?.status === 422) {
                         setValidation(err.response.data.issues)
+                        setError(`${err.response.data.message}`)
                     } else {
                         setError(`${err}`)
                     }
@@ -383,21 +394,30 @@ function EditGroups({groups, setGroups, exams}:{
                     ? {name: g.name, exam_ids: ids}
                     : g)))}
                 examDict={examDict} 
+                erase={() => setGroups(groups.filter(g => g.name !== group.name))}
             />)}
+        <Button onClick={add_group} disabled={groups.filter(group => group.name==="").length>0}>
+            aggiungi gruppo di esami
+        </Button>
     </>
+
+    function add_group() {
+        setGroups([...groups, {name: "", exam_ids: []}])
+    }
 }
 
 type Option = {
     value: string;
     label: string;
   };
 
-function EditGroup({name, setName, group, setGroup, examDict}:{
-    name: string,
-    setName: Dispatch<string>,
-    group: string[],
+function EditGroup({name, setName, group, setGroup, examDict, erase}:{
+    name: string
+    setName: Dispatch<string>
+    group: string[]
     setGroup: Dispatch<string[]>
     examDict: Record<string, {_id: string, name: string, code: string}>
+    erase: () => void
 }) {
     const sort_fun = (a,b) => a.label.localeCompare(b.label)
     const options: Option[] = Object.values(examDict).map(option_from_exam).sort(sort_fun)
@@ -408,6 +428,7 @@ function EditGroup({name, setName, group, setGroup, examDict}:{
 
     return <Group controlId={`group-${name}`} label="gruppo">
         {} <input value={name} onChange={e => setName(e.target.value)} />
+        {} <Button variant="danger" onClick={erase}>elimina gruppo</Button>
         <Select isMulti isSearchable 
             options={options} 
             value={selected}

frontend/src/pages/DegreesPage.tsx

@@ -9,7 +9,7 @@ import {
 
 export default function DegreesPage() {
     return <>
-        <h1>Corsi di Laurea</h1>
+        <h1>Corsi di Studio</h1>
         <QueryTableCard sort="academic_year" direction={-1}>
             <QueryTableBar>
                 <FilterButton>
@@ -21,7 +21,7 @@ export default function DegreesPage() {
                 </FilterButton>
 
                 <ItemAddButton>
-                    Aggiungi corso di Laurea
+                    Aggiungi corso di studio
                 </ItemAddButton>
 
                 <TableTopRightButtons>