#3870 retrieve checked items in query, include top level for items with no checkable tasks

Author: chpy04

src/backend/src/services/onboarding.services.ts

@@ -37,16 +37,31 @@ export default class OnboardingServices {
    * @returns all the checklists that this user has checked
    */
   static async getCheckedChecklists(user: User, organization: Organization) {
-    const allChecklists = await prisma.checklist.findMany({
-      where: { organizationId: organization.organizationId, dateDeleted: null },
-      include: { subtasks: { where: { dateDeleted: null }, orderBy: { displayIndex: 'asc' } }, usersChecked: true },
+    const checkedChecklists = await prisma.checklist.findMany({
+      where: {
+        organizationId: organization.organizationId,
+        dateDeleted: null,
+        // A checklist is checked if the user has checked it, it is an info block, or all its subtasks are checked
+        OR: [
+          { usersChecked: { some: { userId: user.userId } } },
+          { itemType: ChecklistItemType.INFO },
+          {
+            // Checks if the checklist has subtasks and if all subtasks are checked by the user
+            AND: [
+              { subtasks: { some: {} } },
+              {
+                subtasks: {
+                  every: { OR: [{ usersChecked: { some: { userId: user.userId } } }, { itemType: ChecklistItemType.INFO }] }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      include: { subtasks: { where: { dateDeleted: null }, orderBy: { displayIndex: 'asc' } } },
       orderBy: { displayIndex: 'asc' }
     });
 
-    const checkedChecklists = allChecklists.filter((checklist) =>
-      checklist.usersChecked.some((userChecked) => userChecked.userId === user.userId)
-    );
-
     return checkedChecklists;
   }
 

src/frontend/src/pages/HomePage/components/ChecklistSection.tsx

@@ -42,36 +42,36 @@ const ChecklistSection: React.FC<ChecklistSectionProps> = ({ usersChecklists, ch
             <Grid item xs={12} padding={2}>
               <Checklist parentChecklists={checklists} checkedChecklists={checkedChecklists} checklistName={checklistName} />
             </Grid>
-            {checklistName === 'General' && newMemberImageUrl && (
-              <Grid item xs={12} padding={2}>
-                <Box
-                  sx={{
-                    backgroundColor: theme.palette.background.paper,
-                    borderRadius: '10px',
-                    padding: 3,
-                    width: '100%'
-                  }}
-                >
-                  <Typography variant="h5" sx={{ mb: 2 }}>
-                    New Member Events
-                  </Typography>
-                  <Box
-                    component="img"
-                    sx={{
-                      display: 'block',
-                      width: '100%',
-                      maxHeight: '500px',
-                      objectFit: 'contain',
-                      borderRadius: '8px'
-                    }}
-                    alt="New Member Events"
-                    src={newMemberImageUrl}
-                  />
-                </Box>
-              </Grid>
-            )}
           </React.Fragment>
         ))}
+        {newMemberImageUrl && (
+          <Grid item xs={12} padding={2}>
+            <Box
+              sx={{
+                backgroundColor: theme.palette.background.paper,
+                borderRadius: '10px',
+                padding: 3,
+                width: '100%'
+              }}
+            >
+              <Typography variant="h5" sx={{ mb: 2 }}>
+                New Member Events
+              </Typography>
+              <Box
+                component="img"
+                sx={{
+                  display: 'block',
+                  width: '100%',
+                  maxHeight: '500px',
+                  objectFit: 'contain',
+                  borderRadius: '8px'
+                }}
+                alt="New Member Events"
+                src={newMemberImageUrl}
+              />
+            </Box>
+          </Grid>
+        )}
       </Grid>
       {!usersChecklists.length && (
         <Box