Chore/detailed seeder

src/app/_components/NavBar/navDef.ts

@@ -8,7 +8,6 @@ import {
     faShoppingCart,
     faComment,
     faCamera,
-    faList,
     faCircleInfo,
     faNewspaper,
     faCalendar,
@@ -127,12 +126,6 @@ export const itemsForMenu: NavItem[] = [
         show: 'all',
         icon: faCamera,
     },
-    {
-        name: 'Klasselister',
-        href: '/userlist',
-        show: 'loggedIn',
-        icon: faList,
-    },
     {
         name: 'Om Omega',
         href: '/articles/om%20omega',

src/app/users/[username]/page.tsx

@@ -20,7 +20,7 @@ export type PropTypes = {
 export default async function User({ params }: PropTypes) {
     const session = await Session.fromNextAuth()
     if ((await params).username === 'me') {
-        if (!session.user) return notFound()
+        if (!session.user) redirect('/login')
         redirect(`/users/${session.user.username}`) //This throws.
     }
     const profileRes = await readUserProfileAction({ params: { username: (await params).username } })
@@ -33,6 +33,9 @@ export default async function User({ params }: PropTypes) {
     const studyProgrammes = profile.user.memberships.filter(membership => membership.group.groupType === 'STUDY_PROGRAMME')
         .map(membership => membership.group.studyProgramme).filter(membership => membership !== null)
 
+    const classes = profile.user.memberships.filter(membership => membership.group.groupType === 'CLASS')
+        .map(membership => membership.group.class).filter(membership => membership !== null)
+
     const omegaMembership = profile.user.memberships
         .find(membership => membership.group.groupType === 'OMEGA_MEMBERSHIP_GROUP')
     if (!omegaMembership) {
@@ -66,6 +69,9 @@ export default async function User({ params }: PropTypes) {
                                 {studyProgramme.name} {`(${studyProgramme.code})`}
                             </p>
                         )}
+                        { classes.map((classGroup, i) =>
+                            <p key={i} className={styles.studyProgramme}>{classGroup.year}. årstrinn</p>
+                        )}
                         <div className={styles.committeesWrapper}>
                             {
                                 committeeMemberships.filter(membership => membership.active).map(membership =>

src/prisma/seeder/src/development/seedDevEvents.ts

@@ -54,6 +54,24 @@ export default async function seedDevEvents(prisma: PrismaClient) {
         }
     })
 
+    const ohmaBirthday = await eventOperations.create({
+        prisma,
+        bypassAuth: true,
+        data: {
+            name: 'Ohma sin bursdag',
+            location: 'Ohma',
+            eventStart: startDate,
+            eventEnd: endDate,
+            canBeViewdBy: 'ALL',
+            takesRegistration: true,
+            waitingList: true,
+            places: 50,
+            registrationStart: today,
+            registrationEnd: tomorrow,
+            tagIds: [],
+        }
+    })
+
     const someUsers = await prisma.user.findMany({
         take: 10,
         select: {
@@ -67,4 +85,18 @@ export default async function seedDevEvents(prisma: PrismaClient) {
             userId: user.id
         }))
     })
+
+    const aLotOfUsers = await prisma.user.findMany({
+        take: 70,
+        select: {
+            id: true
+        }
+    })
+
+    await prisma.eventRegistration.createMany({
+        data: aLotOfUsers.map(user => ({
+            eventId: ohmaBirthday.id,
+            userId: user.id
+        }))
+    })
 }

src/prisma/seeder/src/development/seedDevUsers.ts

@@ -1,35 +1,55 @@
 import { hashAndEncryptPassword } from '@/auth/passwordHash'
+import { type SeederImage, seedImage } from '@/seeder/src/seedImages'
 import { v4 as uuid } from 'uuid'
-import type { Prisma } from '@prisma/client'
-import { OmegaMembershipLevel, type PrismaClient } from '@prisma/client'
+import { OmegaMembershipLevel, type PrismaClient, type Prisma } from '@prisma/client'
 import { randomInt } from 'crypto'
+import { readdir } from 'fs/promises'
+import { join, dirname } from 'path'
+import { fileURLToPath } from 'url'
+
+const fileName = fileURLToPath(import.meta.url)
+const directoryName = dirname(fileName)
+const profileImageFSLocation = join(directoryName, '..', '..', 'standard_store', 'images', 'dev_profile_images')
+
+async function seedDevProfileImages(prisma: PrismaClient) {
+    let files = await readdir(profileImageFSLocation)
+
+    files = files.filter(file => {
+        const filenameS = file.split('.')
+        const ext = filenameS[filenameS.length - 1]
+        return ext === 'jpg'
+    })
+
+    return await Promise.all(files.map(async file => {
+        const fileS = file.split('.')
+
+        const name = fileS[0]
+
+        const imageConfig: SeederImage = {
+            special: null,
+            name,
+            alt: `Bilde av ${name}`,
+            credit: null,
+            license: null,
+            collection: 'PROFILEIMAGES',
+            fsLocation: file,
+        }
+
+        return await seedImage(prisma, profileImageFSLocation, files, imageConfig)
+    }))
+}
 
 export default async function seedDevUsers(prisma: PrismaClient) {
-    const fn = [
-        'anne', 'johan', 'pål', 'lars', 'lasse', 'leo', 'noa',
-        'trude', 'andreas', 'nora', 'knut', 'anne', 'sara', 'frikk', 'merete', 'klara',
-        'britt helen', 'fiola', 'mika', 'helle', 'jesper'
+    const firstNames = [
+        'Anne', 'Johan', 'Pål', 'Lars', 'Lasse', 'Leo', 'Noa',
+        'Trude', 'Andreas', 'Nora', 'Knut', 'Anne', 'Sara',
+        'Frikk', 'Merete', 'Klara', 'Britt Helen', 'Fiola',
+        'Mika', 'Helle', 'Jesper',
     ]
 
-    const ln = [
-        'hansen', 'johansen', 'olsen', 'larsen', 'larsen', 'leosdatter',
-        'noasdatter', 'trudesdatter', 'lien', 'svendsen',
-        'mattisen', 'mørk', 'ruud', 'hansen', 'johansen', 'olsen',
-        'larsen', 'larsen', 'leosdatter', 'noasdatter', 'trudesdatter',
-        'lien', 'svendsen', 'mattisen', 'mørk', 'ruud', 'hansen', 'johansen', 'olsen', 'larsen',
-        'larsen', 'leosdatter', 'noasdatter', 'trudesdatter', 'lien',
-        'svendsen', 'mattisen', 'mørk', 'ruud', 'hansen', 'johansen', 'olsen', 'larsen', 'larsen',
-        // 'leosdatter', 'noasdatter', 'trudesdatter', 'lien', 'svendsen', 'mattisen',
-        // 'mørk', 'ruud', 'hansen', 'johansen', 'olsen', 'larsen', 'larsen', 'leosdatter',
-        // 'noasdatter', 'trudesdatter', 'lien', 'svendsen', 'mattisen', 'mørk',
-        // 'ruud', 'hansen', 'johansen', 'olsen', 'larsen', 'larsen', 'leosdatter',
-        // 'noasdatter', 'trudesdatter', 'lien', 'svendsen', 'mattisen', 'mørk', 'ruud', 'hansen', 'johansen',
-        // 'olsen', 'larsen', 'larsen', 'leosdatter', 'noasdatter', 'trudesdatter',
-        // 'lien', 'svendsen', 'mattisen', 'mørk', 'ruud', 'hansen', 'johansen', 'olsen', 'larsen', 'larsen', 'leosdatter',
-        // 'noasdatter', 'trudesdatter', 'lien', 'svendsen', 'mattisen', 'mørk', 'ruud',
-        // 'hansen', 'johansen', 'olsen', 'larsen', 'larsen', 'leosdatter',
-        // 'noasdatter', 'trudesdatter', 'lien', 'svendsen', 'mattisen', 'mørk', 'ruud'
-    ]
+    const profileImages = await seedDevProfileImages(prisma)
+
+    const lastNames = profileImages.map(image => (image ? image.name.replaceAll('-', ' ') : 'Navnløs'))
 
     const passwordHash = await hashAndEncryptPassword('password')
 
@@ -47,12 +67,24 @@ export default async function seedDevUsers(prisma: PrismaClient) {
 
     const allStudyProgrammes = await prisma.studyProgramme.findMany()
     const allCommittees = await prisma.committee.findMany()
+    const allClasses = await prisma.class.findMany()
+
+    Promise.all(firstNames.map(async (firstName, i) => {
+        await Promise.all(lastNames.map(async (lastName, j) => {
+            // Randomly remove profile images for 5% of users.
+            const image = (Math.random() < 0.95) ? profileImages.find(img => (img?.name === lastName)) : undefined
+
+            const username = `${firstName}${lastName}${i + 1}${j}`
+                .toLowerCase()
+                .replace(/å/g, 'aa') // special cases for norwegian letters
+                .replace(/æ/g, 'ae')
+                .replace(/ø/g, 'oe')
+                .normalize('NFD') // decompose into letter + diacritics, i.e. 'é' -> 'e´'
+                .replace(/[^a-zA-Z0-9]/g, '') // only keep ASCII alphanumeric characters
 
-    Promise.all(fn.map(async (firstName, i) => {
-        await Promise.all(ln.map(async (lastName, j) => {
             const user = await prisma.user.upsert({
                 where: {
-                    username: `${firstName}${i}${j}`
+                    username,
                 },
                 update: {
 
@@ -61,14 +93,21 @@ export default async function seedDevUsers(prisma: PrismaClient) {
                     firstname: firstName,
                     lastname: lastName,
                     email: uuid(),
-                    username: `${firstName}${i}${j}`,
-                    studentCard: `${firstName}-${i}-${j}`,
+                    username,
+                    studentCard: `${username}s studentkort`,
                     credentials: {
                         create: {
                             passwordHash,
                         },
                     },
                     acceptedTerms: new Date(),
+                    ...(image ? {
+                        image: {
+                            connect: {
+                                id: image.id,
+                            },
+                        },
+                    } : {}),
                 },
             })
 
@@ -92,7 +131,16 @@ export default async function seedDevUsers(prisma: PrismaClient) {
                 order: latestOrder.order
             })
 
-            if (Math.random() > 0.9) {
+            const classMember = allClasses[randomInt(allClasses.length)]
+            memberships.push({
+                groupId: classMember.groupId,
+                userId: user.id,
+                admin: false,
+                active: true,
+                order: latestOrder.order,
+            })
+
+            if (Math.random() > 0.8) {
                 const committee = allCommittees[randomInt(allCommittees.length)]
 
                 memberships.push({
@@ -203,7 +251,7 @@ export default async function seedDevUsers(prisma: PrismaClient) {
             studentCard: 'vever',
             credentials: {
                 create: {
-                    passwordHash: 'password',
+                    passwordHash,
                 },
             },
             emailVerified: new Date(),

src/prisma/seeder/src/dobbelOmega/dobbelOmega.ts

@@ -10,8 +10,8 @@ import { UserMigrator } from './migrateUsers'
 import migrateCommittees from './migrateCommittees'
 import seedProdPermissions from './seedProdPermissions'
 import manifest from '@/seeder/src/logger'
-import type { PrismaClient as PrismaClientPn } from '@prisma/client'
 import { PrismaClient as PrismaClientVeven } from '@/prisma-dobbel-omega/client'
+import type { PrismaClient as PrismaClientPn } from '@prisma/client'
 
 /**
  * !DobbelOmega!