Merge pull request #99 from Unipisa/copilot/make-ssd-field-multiple-selection

Make SSD field in Staff model a multiple selection field

Author: c2d13p

package-lock.json

@@ -76,7 +76,8 @@ router.get('/', async (req, res) => {
                 isInternal: true,
                 $or: [
                     { SSD: { $exists: false } },
-                    { SSD: "" } 
+                    { SSD: [] },
+                    { SSD: "" } // handle legacy data if migration hasn't run yet
                 ],
                 startDate: { $lt: new Date() },
                 qualification: { $ne: 'PTA' },

server/controllers/processes/sanityCheck.js

@@ -43,6 +43,7 @@ async function conferencesQuery(req) {
     }
 
     if (req.query.ssd) {
+        // SSD is now an array; MongoDB will match if the array contains this value
         match["SSD"] = req.query.ssd
     }
 

server/controllers/public/conferences.js

@@ -38,6 +38,7 @@ async function grantsQuery(req) {
     }
 
     if (req.query.ssd) {
+        // SSD is now an array; MongoDB will match if the array contains this value
         match["SSD"] = req.query.ssd
     }
 

server/controllers/public/grants.js

@@ -533,6 +533,36 @@ const migrations = {
         )
         return true
     },
+
+    D20251023_staff_ssd_to_array: async function(db) {
+        const staffs = db.collection('staffs')
+        // Convert existing SSD string values to arrays
+        // For documents where SSD is a string (not already an array)
+        const result = await staffs.updateMany(
+            { SSD: { $type: "string" } },
+            [{
+                $set: {
+                    SSD: {
+                        $cond: {
+                            if: { $or: [{ $eq: ["$SSD", ""] }, { $eq: ["$SSD", null] }] },
+                            then: [],
+                            else: ["$SSD"]
+                        }
+                    }
+                }
+            }]
+        )
+        console.log(`Converted ${result.modifiedCount} staff SSD fields from string to array`)
+        
+        // Ensure documents without SSD field get an empty array
+        const result2 = await staffs.updateMany(
+            { SSD: { $exists: false } },
+            { $set: { SSD: [] } }
+        )
+        console.log(`Set ${result2.modifiedCount} missing SSD fields to empty array`)
+        
+        return true
+    },
 }
 
 async function migrate(db, options) {

server/migrations.js

@@ -4,7 +4,7 @@ const {
     ObjectId, 
     startDate, 
     endDate,
-    SSD, 
+    multipleSSDs, 
     createdBy, 
     updatedBy,
 } = require('./Model')
@@ -27,7 +27,7 @@ const staffSchema = new Schema({
     isInternal: {type: Boolean, label: 'interno al dipartimento', default: true},
     startDate,
     endDate,
-    SSD,
+    SSD: multipleSSDs,
     // 09/04/2025: hiding as not used anymore, CDP
     // photoUrl: {type: String, label: 'URL foto'},
     // wordpressId: String,

server/models/Staff.js

@@ -5,3 +5,13 @@ describe('grant_SSD_can_filter', () => {
         expect(ModelSchemas.Grant.fields.SSD.can_filter).toBe(true)
     })
 })
+
+describe('staff_SSD_is_array', () => {
+    it('is array type', async () => {
+        expect(ModelSchemas.Staff.fields.SSD.type).toBe('array')
+    })
+    
+    it('can_filter', async () => {
+        expect(ModelSchemas.Staff.fields.SSD.can_filter).toBe(true)
+    })
+})

server/test/ModelSchema.test.js

@@ -23,7 +23,7 @@ export default function Conference() {
             title: "", 
             startDate: null,
             endDate: null,
-            SSD: null,
+            SSD: [],
             url: "",
             conferenceRoom: null,
             institution: null,

src/processes/Conference.js

@@ -30,7 +30,9 @@ export default function Visit({variant}) {
     // set SSD from user staffs info
     if (id === '__new__' && variant === 'my/') {
         for (const staff of user.staffs) {
-            if (staff.SSD) visit.SSD = staff.SSD
+            if (staff.SSD && staff.SSD.length > 0) {
+                visit.SSD = Array.isArray(staff.SSD) ? staff.SSD[0] : staff.SSD
+            }
         }
     }
 
@@ -422,8 +424,9 @@ function ActiveVisitDetailsBlock({data, setData, done, variant, fetchSeminars})
             for (const person of people) {
                 if (!person.staffs) continue
                 for (const staff of person.staffs) {
-                    if (staff.SSD) {
-                        setData(data => ({...data, SSD: staff.SSD}))
+                    if (staff.SSD && staff.SSD.length > 0) {
+                        const ssdValue = Array.isArray(staff.SSD) ? staff.SSD[0] : staff.SSD
+                        setData(data => ({...data, SSD: ssdValue}))
                     }
                 }
             }

src/processes/Visit.js

@@ -48,7 +48,8 @@ function PersonBlock({data, en}) {
     const photoUrl = data.photoUrl || "https://www.dm.unipi.it/wp-content/uploads/2024/07/No-Image-Placeholder.png";
     const feminine = data.gender === 'Donna';
     const qualification = (data.staffs || []).map(q => getRoleLabel(q.qualification, en, feminine)).join(', ');
-    const researchGroup = [...new Set(data.staffs.map(q => q.SSD).filter(q => q).map(ssd => getResearchGroupLabel(ssd, en)))].join(', ');
+    // SSD is now an array, so we need to flatten it
+    const researchGroup = [...new Set(data.staffs.flatMap(q => q.SSD || []).filter(ssd => ssd).map(ssd => getResearchGroupLabel(ssd, en)))].join(', ');
     const roomDetails = (data.roomAssignments || []).map(r => getRoomDetails(r.roomDetails, r.room, en));
 
     return (