@studious-lms/server 1.2.53 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.coderabbit.yaml +9 -0
- package/.env.example +9 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +102 -8
- package/dist/index.js.map +1 -1
- package/dist/lib/config/env.d.ts +21 -0
- package/dist/lib/config/env.d.ts.map +1 -1
- package/dist/lib/config/env.js +8 -2
- package/dist/lib/config/env.js.map +1 -1
- package/dist/lib/fileUpload.d.ts.map +1 -1
- package/dist/lib/fileUpload.js +2 -2
- package/dist/lib/fileUpload.js.map +1 -1
- package/dist/lib/googleCloudStorage.d.ts +6 -0
- package/dist/lib/googleCloudStorage.d.ts.map +1 -1
- package/dist/lib/googleCloudStorage.js +19 -2
- package/dist/lib/googleCloudStorage.js.map +1 -1
- package/dist/lib/pusher.d.ts +4 -1
- package/dist/lib/pusher.d.ts.map +1 -1
- package/dist/lib/pusher.js +6 -3
- package/dist/lib/pusher.js.map +1 -1
- package/dist/lib/redis.d.ts +5 -0
- package/dist/lib/redis.d.ts.map +1 -0
- package/dist/lib/redis.js +53 -0
- package/dist/lib/redis.js.map +1 -0
- package/dist/lib/thumbnailGenerator.d.ts +0 -21
- package/dist/lib/thumbnailGenerator.d.ts.map +1 -1
- package/dist/lib/thumbnailGenerator.js +157 -160
- package/dist/lib/thumbnailGenerator.js.map +1 -1
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +33 -95
- package/dist/middleware/auth.js.map +1 -1
- package/dist/models/agenda.d.ts +97 -0
- package/dist/models/agenda.d.ts.map +1 -0
- package/dist/models/agenda.js +40 -0
- package/dist/models/agenda.js.map +1 -0
- package/dist/models/announcement.d.ts +223 -0
- package/dist/models/announcement.d.ts.map +1 -0
- package/dist/models/announcement.js +120 -0
- package/dist/models/announcement.js.map +1 -0
- package/dist/models/assignment.d.ts +1292 -0
- package/dist/models/assignment.d.ts.map +1 -0
- package/dist/models/assignment.js +309 -0
- package/dist/models/assignment.js.map +1 -0
- package/dist/models/attendance.d.ts +180 -0
- package/dist/models/attendance.d.ts.map +1 -0
- package/dist/models/attendance.js +188 -0
- package/dist/models/attendance.js.map +1 -0
- package/dist/models/auth.d.ts +153 -0
- package/dist/models/auth.d.ts.map +1 -0
- package/dist/models/auth.js +217 -0
- package/dist/models/auth.js.map +1 -0
- package/dist/models/class.d.ts +461 -0
- package/dist/models/class.d.ts.map +1 -0
- package/dist/models/class.js +645 -0
- package/dist/models/class.js.map +1 -0
- package/dist/models/comment.d.ts +171 -0
- package/dist/models/comment.d.ts.map +1 -0
- package/dist/models/comment.js +138 -0
- package/dist/models/comment.js.map +1 -0
- package/dist/models/conversation.d.ts +164 -0
- package/dist/models/conversation.d.ts.map +1 -0
- package/dist/models/conversation.js +175 -0
- package/dist/models/conversation.js.map +1 -0
- package/dist/models/event.d.ts +295 -0
- package/dist/models/event.d.ts.map +1 -0
- package/dist/models/event.js +145 -0
- package/dist/models/event.js.map +1 -0
- package/dist/models/file.d.ts +536 -0
- package/dist/models/file.d.ts.map +1 -0
- package/dist/models/file.js +126 -0
- package/dist/models/file.js.map +1 -0
- package/dist/models/folder.d.ts +295 -0
- package/dist/models/folder.d.ts.map +1 -0
- package/dist/models/folder.js +202 -0
- package/dist/models/folder.js.map +1 -0
- package/dist/models/labChat.d.ts +243 -0
- package/dist/models/labChat.d.ts.map +1 -0
- package/dist/models/labChat.js +204 -0
- package/dist/models/labChat.js.map +1 -0
- package/dist/models/marketing.d.ts +72 -0
- package/dist/models/marketing.d.ts.map +1 -0
- package/dist/models/marketing.js +26 -0
- package/dist/models/marketing.js.map +1 -0
- package/dist/models/message.d.ts +100 -0
- package/dist/models/message.d.ts.map +1 -0
- package/dist/models/message.js +131 -0
- package/dist/models/message.js.map +1 -0
- package/dist/models/newtonChat.d.ts +72 -0
- package/dist/models/newtonChat.d.ts.map +1 -0
- package/dist/models/newtonChat.js +61 -0
- package/dist/models/newtonChat.js.map +1 -0
- package/dist/models/notification.d.ts +65 -0
- package/dist/models/notification.d.ts.map +1 -0
- package/dist/models/notification.js +46 -0
- package/dist/models/notification.js.map +1 -0
- package/dist/models/section.d.ts +102 -0
- package/dist/models/section.d.ts.map +1 -0
- package/dist/models/section.js +83 -0
- package/dist/models/section.js.map +1 -0
- package/dist/models/user.d.ts +39 -0
- package/dist/models/user.d.ts.map +1 -0
- package/dist/models/user.js +38 -0
- package/dist/models/user.js.map +1 -0
- package/dist/models/worksheet.d.ts +460 -0
- package/dist/models/worksheet.d.ts.map +1 -0
- package/dist/models/worksheet.js +200 -0
- package/dist/models/worksheet.js.map +1 -0
- package/dist/pipelines/aiLabChat.d.ts +76 -0
- package/dist/pipelines/aiLabChat.d.ts.map +1 -0
- package/dist/pipelines/aiLabChat.js +599 -0
- package/dist/pipelines/aiLabChat.js.map +1 -0
- package/dist/pipelines/aiNewtonChat.d.ts +30 -0
- package/dist/pipelines/aiNewtonChat.d.ts.map +1 -0
- package/dist/pipelines/aiNewtonChat.js +289 -0
- package/dist/pipelines/aiNewtonChat.js.map +1 -0
- package/dist/pipelines/gradeWorksheet.d.ts +30 -0
- package/dist/pipelines/gradeWorksheet.d.ts.map +1 -0
- package/dist/pipelines/gradeWorksheet.js +252 -0
- package/dist/pipelines/gradeWorksheet.js.map +1 -0
- package/dist/routers/_app.d.ts +1523 -1315
- package/dist/routers/_app.d.ts.map +1 -1
- package/dist/routers/agenda.d.ts +22 -22
- package/dist/routers/agenda.d.ts.map +1 -1
- package/dist/routers/agenda.js +4 -65
- package/dist/routers/agenda.js.map +1 -1
- package/dist/routers/announcement.d.ts +16 -16
- package/dist/routers/announcement.d.ts.map +1 -1
- package/dist/routers/announcement.js +37 -446
- package/dist/routers/announcement.js.map +1 -1
- package/dist/routers/assignment.d.ts +300 -378
- package/dist/routers/assignment.d.ts.map +1 -1
- package/dist/routers/assignment.js +78 -1868
- package/dist/routers/assignment.js.map +1 -1
- package/dist/routers/attendance.d.ts +19 -9
- package/dist/routers/attendance.d.ts.map +1 -1
- package/dist/routers/attendance.js +7 -264
- package/dist/routers/attendance.js.map +1 -1
- package/dist/routers/auth.d.ts +2 -2
- package/dist/routers/auth.d.ts.map +1 -1
- package/dist/routers/auth.js +29 -354
- package/dist/routers/auth.js.map +1 -1
- package/dist/routers/class.d.ts +160 -68
- package/dist/routers/class.d.ts.map +1 -1
- package/dist/routers/class.js +82 -1052
- package/dist/routers/class.js.map +1 -1
- package/dist/routers/comment.d.ts +6 -42
- package/dist/routers/comment.d.ts.map +1 -1
- package/dist/routers/comment.js +24 -244
- package/dist/routers/comment.js.map +1 -1
- package/dist/routers/conversation.d.ts +45 -7
- package/dist/routers/conversation.d.ts.map +1 -1
- package/dist/routers/conversation.js +19 -327
- package/dist/routers/conversation.js.map +1 -1
- package/dist/routers/event.d.ts +36 -36
- package/dist/routers/event.d.ts.map +1 -1
- package/dist/routers/event.js +13 -433
- package/dist/routers/event.js.map +1 -1
- package/dist/routers/file.d.ts +2 -2
- package/dist/routers/file.d.ts.map +1 -1
- package/dist/routers/file.js +9 -323
- package/dist/routers/file.js.map +1 -1
- package/dist/routers/folder.d.ts +21 -14
- package/dist/routers/folder.d.ts.map +1 -1
- package/dist/routers/folder.js +34 -745
- package/dist/routers/folder.js.map +1 -1
- package/dist/routers/labChat.d.ts +21 -11
- package/dist/routers/labChat.d.ts.map +1 -1
- package/dist/routers/labChat.js +22 -570
- package/dist/routers/labChat.js.map +1 -1
- package/dist/routers/marketing.d.ts +1 -1
- package/dist/routers/marketing.d.ts.map +1 -1
- package/dist/routers/marketing.js +7 -56
- package/dist/routers/marketing.js.map +1 -1
- package/dist/routers/message.d.ts +13 -2
- package/dist/routers/message.d.ts.map +1 -1
- package/dist/routers/message.js +32 -520
- package/dist/routers/message.js.map +1 -1
- package/dist/routers/newtonChat.d.ts +1 -1
- package/dist/routers/newtonChat.d.ts.map +1 -1
- package/dist/routers/newtonChat.js +7 -246
- package/dist/routers/newtonChat.js.map +1 -1
- package/dist/routers/notifications.d.ts +4 -4
- package/dist/routers/notifications.d.ts.map +1 -1
- package/dist/routers/notifications.js +18 -83
- package/dist/routers/notifications.js.map +1 -1
- package/dist/routers/section.d.ts +4 -4
- package/dist/routers/section.d.ts.map +1 -1
- package/dist/routers/section.js +14 -286
- package/dist/routers/section.js.map +1 -1
- package/dist/routers/user.d.ts +1 -1
- package/dist/routers/user.d.ts.map +1 -1
- package/dist/routers/user.js +32 -207
- package/dist/routers/user.js.map +1 -1
- package/dist/routers/worksheet.d.ts +68 -55
- package/dist/routers/worksheet.d.ts.map +1 -1
- package/dist/routers/worksheet.js +79 -394
- package/dist/routers/worksheet.js.map +1 -1
- package/dist/seedDatabase.d.ts +1 -1
- package/dist/server/pipelines/gradeWorksheet.d.ts +6 -6
- package/dist/server/pipelines/gradeWorksheet.d.ts.map +1 -1
- package/dist/server/pipelines/gradeWorksheet.js +12 -5
- package/dist/server/pipelines/gradeWorksheet.js.map +1 -1
- package/dist/services/agenda.d.ts +100 -0
- package/dist/services/agenda.d.ts.map +1 -0
- package/dist/services/agenda.js +21 -0
- package/dist/services/agenda.js.map +1 -0
- package/dist/services/announcement.d.ts +135 -0
- package/dist/services/announcement.d.ts.map +1 -0
- package/dist/services/announcement.js +223 -0
- package/dist/services/announcement.js.map +1 -0
- package/dist/services/assignment.d.ts +1462 -0
- package/dist/services/assignment.d.ts.map +1 -0
- package/dist/services/assignment.js +898 -0
- package/dist/services/assignment.js.map +1 -0
- package/dist/services/attendance.d.ts +93 -0
- package/dist/services/attendance.d.ts.map +1 -0
- package/dist/services/attendance.js +61 -0
- package/dist/services/attendance.js.map +1 -0
- package/dist/services/auth.d.ts +68 -0
- package/dist/services/auth.d.ts.map +1 -0
- package/dist/services/auth.js +218 -0
- package/dist/services/auth.js.map +1 -0
- package/dist/services/class.d.ts +643 -0
- package/dist/services/class.d.ts.map +1 -0
- package/dist/services/class.js +486 -0
- package/dist/services/class.js.map +1 -0
- package/dist/services/comment.d.ts +100 -0
- package/dist/services/comment.d.ts.map +1 -0
- package/dist/services/comment.js +83 -0
- package/dist/services/comment.js.map +1 -0
- package/dist/services/conversation.d.ts +159 -0
- package/dist/services/conversation.d.ts.map +1 -0
- package/dist/services/conversation.js +138 -0
- package/dist/services/conversation.js.map +1 -0
- package/dist/services/event.d.ts +216 -0
- package/dist/services/event.d.ts.map +1 -0
- package/dist/services/event.js +168 -0
- package/dist/services/event.js.map +1 -0
- package/dist/services/file.d.ts +74 -0
- package/dist/services/file.d.ts.map +1 -0
- package/dist/services/file.js +133 -0
- package/dist/services/file.js.map +1 -0
- package/dist/services/folder.d.ts +239 -0
- package/dist/services/folder.d.ts.map +1 -0
- package/dist/services/folder.js +248 -0
- package/dist/services/folder.js.map +1 -0
- package/dist/services/labChat.d.ts +169 -0
- package/dist/services/labChat.d.ts.map +1 -0
- package/dist/services/labChat.js +381 -0
- package/dist/services/labChat.js.map +1 -0
- package/dist/services/marketing.d.ts +50 -0
- package/dist/services/marketing.d.ts.map +1 -0
- package/dist/services/marketing.js +32 -0
- package/dist/services/marketing.js.map +1 -0
- package/dist/services/message.d.ts +103 -0
- package/dist/services/message.d.ts.map +1 -0
- package/dist/services/message.js +422 -0
- package/dist/services/message.js.map +1 -0
- package/dist/services/newtonChat.d.ts +22 -0
- package/dist/services/newtonChat.d.ts.map +1 -0
- package/dist/services/newtonChat.js +174 -0
- package/dist/services/newtonChat.js.map +1 -0
- package/dist/services/notification.d.ts +65 -0
- package/dist/services/notification.d.ts.map +1 -0
- package/dist/services/notification.js +33 -0
- package/dist/services/notification.js.map +1 -0
- package/dist/services/section.d.ts +53 -0
- package/dist/services/section.d.ts.map +1 -0
- package/dist/services/section.js +199 -0
- package/dist/services/section.js.map +1 -0
- package/dist/services/user.d.ts +48 -0
- package/dist/services/user.d.ts.map +1 -0
- package/dist/services/user.js +141 -0
- package/dist/services/user.js.map +1 -0
- package/dist/services/worksheet.d.ts +239 -0
- package/dist/services/worksheet.d.ts.map +1 -0
- package/dist/services/worksheet.js +235 -0
- package/dist/services/worksheet.js.map +1 -0
- package/dist/utils/aiUser.d.ts +1 -3
- package/dist/utils/aiUser.d.ts.map +1 -1
- package/dist/utils/aiUser.js +6 -5
- package/dist/utils/aiUser.js.map +1 -1
- package/dist/utils/email.d.ts +3 -0
- package/dist/utils/email.d.ts.map +1 -1
- package/dist/utils/email.js +7 -4
- package/dist/utils/email.js.map +1 -1
- package/dist/utils/generateInviteCode.d.ts +1 -2
- package/dist/utils/generateInviteCode.d.ts.map +1 -1
- package/dist/utils/generateInviteCode.js +3 -4
- package/dist/utils/generateInviteCode.js.map +1 -1
- package/dist/utils/inference.d.ts +3 -0
- package/dist/utils/inference.d.ts.map +1 -1
- package/dist/utils/inference.js +7 -4
- package/dist/utils/inference.js.map +1 -1
- package/dist/utils/logger.d.ts +3 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +5 -2
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/prismaErrorHandler.d.ts.map +1 -1
- package/dist/utils/prismaErrorHandler.js +5 -2
- package/dist/utils/prismaErrorHandler.js.map +1 -1
- package/dist/utils/prismaWrapper.d.ts +1 -0
- package/dist/utils/prismaWrapper.d.ts.map +1 -1
- package/dist/utils/prismaWrapper.js +6 -2
- package/dist/utils/prismaWrapper.js.map +1 -1
- package/docker-compose.yml +5 -0
- package/package.json +4 -3
- package/prisma/schema.prisma +1 -1
- package/src/index.ts +119 -12
- package/src/lib/config/env.ts +6 -0
- package/src/lib/fileUpload.ts +0 -1
- package/src/lib/googleCloudStorage.ts +17 -0
- package/src/lib/pusher.ts +5 -1
- package/src/lib/redis.ts +56 -0
- package/src/lib/thumbnailGenerator.ts +170 -168
- package/src/middleware/auth.ts +80 -137
- package/src/models/agenda.ts +46 -0
- package/src/models/announcement.ts +134 -0
- package/src/models/assignment.ts +322 -0
- package/src/models/attendance.ts +208 -0
- package/src/models/auth.ts +247 -0
- package/src/models/class.ts +703 -0
- package/src/models/comment.ts +152 -0
- package/src/models/conversation.ts +200 -0
- package/src/models/event.ts +177 -0
- package/src/models/file.ts +129 -0
- package/src/models/folder.ts +225 -0
- package/src/models/labChat.ts +213 -0
- package/src/models/marketing.ts +45 -0
- package/src/models/message.ts +153 -0
- package/src/models/newtonChat.ts +70 -0
- package/src/models/notification.ts +54 -0
- package/src/models/section.ts +98 -0
- package/src/models/user.ts +47 -0
- package/src/models/worksheet.ts +294 -0
- package/src/pipelines/aiLabChat.ts +684 -0
- package/src/{server/pipelines → pipelines}/aiNewtonChat.ts +9 -5
- package/src/{server/pipelines → pipelines}/gradeWorksheet.ts +25 -14
- package/src/routers/agenda.ts +3 -66
- package/src/routers/announcement.ts +54 -495
- package/src/routers/assignment.ts +126 -2018
- package/src/routers/attendance.ts +15 -276
- package/src/routers/auth.ts +79 -442
- package/src/routers/class.ts +263 -1187
- package/src/routers/comment.ts +61 -288
- package/src/routers/conversation.ts +51 -360
- package/src/routers/event.ts +50 -481
- package/src/routers/file.ts +45 -368
- package/src/routers/folder.ts +107 -836
- package/src/routers/labChat.ts +35 -604
- package/src/routers/marketing.ts +35 -77
- package/src/routers/message.ts +54 -567
- package/src/routers/newtonChat.ts +17 -278
- package/src/routers/notifications.ts +32 -82
- package/src/routers/section.ts +46 -330
- package/src/routers/user.ts +49 -227
- package/src/routers/worksheet.ts +215 -503
- package/src/services/agenda.ts +21 -0
- package/src/services/announcement.ts +290 -0
- package/src/services/assignment.ts +1198 -0
- package/src/services/attendance.ts +85 -0
- package/src/services/auth.ts +277 -0
- package/src/services/class.ts +629 -0
- package/src/services/comment.ts +106 -0
- package/src/services/conversation.ts +213 -0
- package/src/services/event.ts +231 -0
- package/src/services/file.ts +167 -0
- package/src/services/folder.ts +316 -0
- package/src/services/labChat.ts +458 -0
- package/src/services/marketing.ts +57 -0
- package/src/services/message.ts +554 -0
- package/src/services/newtonChat.ts +222 -0
- package/src/services/notification.ts +50 -0
- package/src/services/section.ts +283 -0
- package/src/services/user.ts +172 -0
- package/src/services/worksheet.ts +358 -0
- package/src/utils/aiUser.ts +4 -3
- package/src/utils/email.ts +5 -3
- package/src/utils/generateInviteCode.ts +1 -3
- package/src/utils/inference.ts +5 -2
- package/src/utils/logger.ts +3 -1
- package/src/utils/prismaErrorHandler.ts +3 -0
- package/src/utils/prismaWrapper.ts +4 -0
- package/tests/globalSetup.ts +62 -0
- package/tests/helpers.ts +22 -0
- package/tests/middleware/security.test.ts +42 -0
- package/tests/routers/agenda.test.ts +138 -0
- package/tests/routers/announcement.test.ts +490 -0
- package/tests/routers/assignment.test.ts +837 -0
- package/tests/{attendance.test.ts → routers/attendance.test.ts} +6 -14
- package/tests/routers/auth.test.ts +171 -0
- package/tests/{class.test.ts → routers/class.test.ts} +131 -85
- package/tests/routers/comment.test.ts +126 -0
- package/tests/routers/conversation.test.ts +145 -0
- package/tests/{event.test.ts → routers/event.test.ts} +93 -32
- package/tests/routers/folder.test.ts +178 -0
- package/tests/routers/labChat.test.ts +115 -0
- package/tests/routers/marketing.test.ts +59 -0
- package/tests/routers/message.test.ts +123 -0
- package/tests/routers/notification.test.ts +69 -0
- package/tests/{section.test.ts → routers/section.test.ts} +5 -13
- package/tests/server/rateLimit.test.ts +73 -0
- package/tests/setup.ts +18 -92
- package/tests/user.test.ts +9 -31
- package/tests/utils/aiUser.test.ts +22 -0
- package/tests/utils/generateInviteCode.test.ts +24 -0
- package/tests/utils/logger.test.ts +74 -0
- package/tests/utils/prismaErrorHandler.test.ts +101 -0
- package/tests/utils/prismaWrapper.test.ts +82 -0
- package/tests/worksheet.test.ts +181 -0
- package/vitest.config.ts +6 -3
- package/vitest.unit.config.ts +21 -0
- package/TODO.md +0 -2
- package/coverage/base.css +0 -224
- package/coverage/block-navigation.js +0 -87
- package/coverage/clover.xml +0 -12110
- package/coverage/coverage-final.json +0 -44
- package/coverage/favicon.png +0 -0
- package/coverage/index.html +0 -221
- package/coverage/prettify.css +0 -1
- package/coverage/prettify.js +0 -2
- package/coverage/server/index.html +0 -116
- package/coverage/server/src/exportType.ts.html +0 -109
- package/coverage/server/src/index.html +0 -161
- package/coverage/server/src/index.ts.html +0 -1702
- package/coverage/server/src/instrument.ts.html +0 -130
- package/coverage/server/src/lib/config/env.ts.html +0 -448
- package/coverage/server/src/lib/config/index.html +0 -116
- package/coverage/server/src/lib/fileUpload.ts.html +0 -1138
- package/coverage/server/src/lib/googleCloudStorage.ts.html +0 -334
- package/coverage/server/src/lib/index.html +0 -206
- package/coverage/server/src/lib/jsonConversion.ts.html +0 -2323
- package/coverage/server/src/lib/jsonStyles.ts.html +0 -193
- package/coverage/server/src/lib/notificationHandler.ts.html +0 -193
- package/coverage/server/src/lib/pusher.ts.html +0 -121
- package/coverage/server/src/lib/thumbnailGenerator.ts.html +0 -592
- package/coverage/server/src/middleware/auth.ts.html +0 -646
- package/coverage/server/src/middleware/index.html +0 -146
- package/coverage/server/src/middleware/logging.ts.html +0 -244
- package/coverage/server/src/middleware/security.ts.html +0 -271
- package/coverage/server/src/routers/_app.ts.html +0 -232
- package/coverage/server/src/routers/agenda.ts.html +0 -319
- package/coverage/server/src/routers/announcement.ts.html +0 -3481
- package/coverage/server/src/routers/assignment.ts.html +0 -7633
- package/coverage/server/src/routers/attendance.ts.html +0 -1030
- package/coverage/server/src/routers/auth.ts.html +0 -1081
- package/coverage/server/src/routers/class.ts.html +0 -3535
- package/coverage/server/src/routers/comment.ts.html +0 -991
- package/coverage/server/src/routers/conversation.ts.html +0 -982
- package/coverage/server/src/routers/event.ts.html +0 -1609
- package/coverage/server/src/routers/file.ts.html +0 -1144
- package/coverage/server/src/routers/folder.ts.html +0 -2797
- package/coverage/server/src/routers/index.html +0 -386
- package/coverage/server/src/routers/labChat.ts.html +0 -3073
- package/coverage/server/src/routers/marketing.ts.html +0 -340
- package/coverage/server/src/routers/message.ts.html +0 -1912
- package/coverage/server/src/routers/notifications.ts.html +0 -364
- package/coverage/server/src/routers/section.ts.html +0 -1120
- package/coverage/server/src/routers/user.ts.html +0 -862
- package/coverage/server/src/routers/worksheet.ts.html +0 -1729
- package/coverage/server/src/trpc.ts.html +0 -397
- package/coverage/server/src/types/index.html +0 -116
- package/coverage/server/src/types/trpc.ts.html +0 -127
- package/coverage/server/src/utils/aiUser.ts.html +0 -280
- package/coverage/server/src/utils/email.ts.html +0 -121
- package/coverage/server/src/utils/generateInviteCode.ts.html +0 -106
- package/coverage/server/src/utils/index.html +0 -206
- package/coverage/server/src/utils/inference.ts.html +0 -709
- package/coverage/server/src/utils/logger.ts.html +0 -664
- package/coverage/server/src/utils/prismaErrorHandler.ts.html +0 -907
- package/coverage/server/src/utils/prismaWrapper.ts.html +0 -355
- package/coverage/server/vitest.config.ts.html +0 -196
- package/coverage/sort-arrow-sprite.png +0 -0
- package/coverage/sorter.js +0 -210
- package/src/lib/notificationHandler.ts +0 -36
- package/src/server/pipelines/aiLabChat.ts +0 -507
- package/tests/announcement.test.ts +0 -164
- package/tests/assignment.test.ts +0 -296
- package/tests/auth.test.ts +0 -48
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Assignment model – assignments, submissions, attachments.
|
|
3
|
+
*/
|
|
4
|
+
import { prisma } from "../lib/prisma.js";
|
|
5
|
+
|
|
6
|
+
const assignmentGetInclude = {
|
|
7
|
+
submissions: {
|
|
8
|
+
select: {
|
|
9
|
+
student: { select: { id: true, username: true } },
|
|
10
|
+
},
|
|
11
|
+
},
|
|
12
|
+
attachments: {
|
|
13
|
+
select: {
|
|
14
|
+
id: true,
|
|
15
|
+
name: true,
|
|
16
|
+
type: true,
|
|
17
|
+
size: true,
|
|
18
|
+
path: true,
|
|
19
|
+
uploadedAt: true,
|
|
20
|
+
thumbnailId: true,
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
section: { select: { id: true, name: true } },
|
|
24
|
+
teacher: { select: { id: true, username: true } },
|
|
25
|
+
worksheets: { select: { id: true, name: true } },
|
|
26
|
+
class: { select: { id: true, name: true } },
|
|
27
|
+
eventAttached: {
|
|
28
|
+
select: {
|
|
29
|
+
id: true,
|
|
30
|
+
name: true,
|
|
31
|
+
startTime: true,
|
|
32
|
+
endTime: true,
|
|
33
|
+
location: true,
|
|
34
|
+
remarks: true,
|
|
35
|
+
color: true,
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
markScheme: { select: { id: true, structured: true } },
|
|
39
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
40
|
+
} as const;
|
|
41
|
+
|
|
42
|
+
/** @returns Assignment by ID. */
|
|
43
|
+
export function findAssignmentById(id: string) {
|
|
44
|
+
return prisma.assignment.findUnique({
|
|
45
|
+
where: { id },
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** @returns Assignment with full details for get. */
|
|
50
|
+
export function findAssignmentWithDetails(id: string) {
|
|
51
|
+
return prisma.assignment.findUnique({
|
|
52
|
+
where: { id },
|
|
53
|
+
include: assignmentGetInclude,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** @returns Assignment with attachments for delete. */
|
|
58
|
+
export function findAssignmentForDelete(id: string, teacherId: string) {
|
|
59
|
+
return prisma.assignment.findFirst({
|
|
60
|
+
where: { id, teacherId },
|
|
61
|
+
include: {
|
|
62
|
+
attachments: { include: { thumbnail: true } },
|
|
63
|
+
submissions: {
|
|
64
|
+
include: {
|
|
65
|
+
attachments: { include: { thumbnail: true } },
|
|
66
|
+
annotations: { include: { thumbnail: true } },
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** @returns Assignments due today. */
|
|
74
|
+
export function findAssignmentsDueToday() {
|
|
75
|
+
return prisma.assignment.findMany({
|
|
76
|
+
where: {
|
|
77
|
+
dueDate: { equals: new Date() },
|
|
78
|
+
},
|
|
79
|
+
select: {
|
|
80
|
+
id: true,
|
|
81
|
+
title: true,
|
|
82
|
+
dueDate: true,
|
|
83
|
+
type: true,
|
|
84
|
+
graded: true,
|
|
85
|
+
maxGrade: true,
|
|
86
|
+
class: { select: { id: true, name: true } },
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** @returns Submission by assignment and student. */
|
|
92
|
+
export function findSubmissionByAssignmentAndStudent(assignmentId: string, studentId: string) {
|
|
93
|
+
return prisma.submission.findFirst({
|
|
94
|
+
where: { assignmentId, studentId },
|
|
95
|
+
include: {
|
|
96
|
+
attachments: true,
|
|
97
|
+
student: { select: { id: true, username: true, profile: true } },
|
|
98
|
+
assignment: {
|
|
99
|
+
include: {
|
|
100
|
+
class: true,
|
|
101
|
+
markScheme: { select: { id: true, structured: true } },
|
|
102
|
+
worksheets: { select: { id: true, name: true } },
|
|
103
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
annotations: true,
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** @returns Submission by ID for class member. */
|
|
112
|
+
export function findSubmissionByIdForClassMember(submissionId: string, classId: string, userId: string) {
|
|
113
|
+
return prisma.submission.findFirst({
|
|
114
|
+
where: {
|
|
115
|
+
id: submissionId,
|
|
116
|
+
assignment: {
|
|
117
|
+
classId,
|
|
118
|
+
class: {
|
|
119
|
+
OR: [
|
|
120
|
+
{ teachers: { some: { id: userId } } },
|
|
121
|
+
{ students: { some: { id: userId } } },
|
|
122
|
+
],
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
},
|
|
126
|
+
include: {
|
|
127
|
+
attachments: true,
|
|
128
|
+
annotations: true,
|
|
129
|
+
student: { select: { id: true, username: true, profile: true } },
|
|
130
|
+
assignment: {
|
|
131
|
+
include: {
|
|
132
|
+
class: true,
|
|
133
|
+
markScheme: { select: { id: true, structured: true } },
|
|
134
|
+
worksheets: { select: { id: true, name: true } },
|
|
135
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
136
|
+
},
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** @returns Submission by ID for update (student or teacher). */
|
|
143
|
+
export function findSubmissionForUpdate(submissionId: string, userId: string) {
|
|
144
|
+
return prisma.submission.findFirst({
|
|
145
|
+
where: {
|
|
146
|
+
id: submissionId,
|
|
147
|
+
OR: [
|
|
148
|
+
{ studentId: userId },
|
|
149
|
+
{
|
|
150
|
+
assignment: {
|
|
151
|
+
class: {
|
|
152
|
+
teachers: { some: { id: userId } },
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
],
|
|
157
|
+
},
|
|
158
|
+
include: {
|
|
159
|
+
attachments: { include: { thumbnail: true } },
|
|
160
|
+
assignment: {
|
|
161
|
+
include: {
|
|
162
|
+
class: true,
|
|
163
|
+
markScheme: { select: { id: true, structured: true } },
|
|
164
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
165
|
+
},
|
|
166
|
+
},
|
|
167
|
+
},
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/** Create a submission. */
|
|
172
|
+
export function createSubmission(assignmentId: string, studentId: string) {
|
|
173
|
+
return prisma.submission.create({
|
|
174
|
+
data: {
|
|
175
|
+
assignment: { connect: { id: assignmentId } },
|
|
176
|
+
student: { connect: { id: studentId } },
|
|
177
|
+
},
|
|
178
|
+
include: {
|
|
179
|
+
attachments: true,
|
|
180
|
+
annotations: true,
|
|
181
|
+
student: { select: { id: true, username: true } },
|
|
182
|
+
assignment: {
|
|
183
|
+
include: {
|
|
184
|
+
class: true,
|
|
185
|
+
markScheme: { select: { id: true, structured: true } },
|
|
186
|
+
worksheets: { select: { id: true, name: true } },
|
|
187
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
},
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/** @returns Sections for a class. */
|
|
195
|
+
export function findSectionsByClassId(classId: string) {
|
|
196
|
+
return prisma.section.findMany({
|
|
197
|
+
where: { classId },
|
|
198
|
+
select: { id: true, name: true },
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/** @returns Assignment with class for teacher (auth check). */
|
|
203
|
+
export function findAssignmentWithClassForTeacher(assignmentId: string, teacherId: string) {
|
|
204
|
+
return prisma.assignment.findFirst({
|
|
205
|
+
where: {
|
|
206
|
+
id: assignmentId,
|
|
207
|
+
class: { teachers: { some: { id: teacherId } } },
|
|
208
|
+
},
|
|
209
|
+
include: { class: true },
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
/** @returns Submissions for assignment (teacher view). */
|
|
214
|
+
export function findSubmissionsByAssignmentForTeacher(assignmentId: string, teacherId: string) {
|
|
215
|
+
return prisma.submission.findMany({
|
|
216
|
+
where: {
|
|
217
|
+
assignment: {
|
|
218
|
+
id: assignmentId,
|
|
219
|
+
class: { teachers: { some: { id: teacherId } } },
|
|
220
|
+
},
|
|
221
|
+
},
|
|
222
|
+
include: {
|
|
223
|
+
attachments: { include: { thumbnail: true } },
|
|
224
|
+
student: {
|
|
225
|
+
select: {
|
|
226
|
+
id: true,
|
|
227
|
+
username: true,
|
|
228
|
+
profile: {
|
|
229
|
+
select: {
|
|
230
|
+
displayName: true,
|
|
231
|
+
profilePicture: true,
|
|
232
|
+
profilePictureThumbnail: true,
|
|
233
|
+
},
|
|
234
|
+
},
|
|
235
|
+
},
|
|
236
|
+
},
|
|
237
|
+
assignment: {
|
|
238
|
+
include: {
|
|
239
|
+
class: true,
|
|
240
|
+
markScheme: { select: { id: true, structured: true } },
|
|
241
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
242
|
+
},
|
|
243
|
+
},
|
|
244
|
+
},
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
/** @returns Submission by ID for teacher update. */
|
|
249
|
+
export function findSubmissionForTeacherUpdate(submissionId: string, teacherId: string) {
|
|
250
|
+
return prisma.submission.findFirst({
|
|
251
|
+
where: {
|
|
252
|
+
id: submissionId,
|
|
253
|
+
assignment: {
|
|
254
|
+
class: { teachers: { some: { id: teacherId } } },
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
include: {
|
|
258
|
+
attachments: { include: { thumbnail: true } },
|
|
259
|
+
annotations: { include: { thumbnail: true } },
|
|
260
|
+
assignment: {
|
|
261
|
+
include: {
|
|
262
|
+
class: true,
|
|
263
|
+
markScheme: { select: { id: true, structured: true } },
|
|
264
|
+
gradingBoundary: { select: { id: true, structured: true } },
|
|
265
|
+
},
|
|
266
|
+
},
|
|
267
|
+
},
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
/** @returns Events in class that don't have this assignment attached. */
|
|
272
|
+
export function findAvailableEventsForAssignment(classId: string, assignmentId: string) {
|
|
273
|
+
return prisma.event.findMany({
|
|
274
|
+
where: {
|
|
275
|
+
classId,
|
|
276
|
+
assignmentsAttached: { none: { id: assignmentId } },
|
|
277
|
+
},
|
|
278
|
+
select: {
|
|
279
|
+
id: true,
|
|
280
|
+
name: true,
|
|
281
|
+
startTime: true,
|
|
282
|
+
endTime: true,
|
|
283
|
+
location: true,
|
|
284
|
+
remarks: true,
|
|
285
|
+
color: true,
|
|
286
|
+
},
|
|
287
|
+
orderBy: { startTime: "asc" },
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
const assignmentAttachEventInclude = {
|
|
292
|
+
attachments: { select: { id: true, name: true, type: true } },
|
|
293
|
+
section: { select: { id: true, name: true } },
|
|
294
|
+
teacher: { select: { id: true, username: true } },
|
|
295
|
+
eventAttached: {
|
|
296
|
+
select: {
|
|
297
|
+
id: true,
|
|
298
|
+
name: true,
|
|
299
|
+
startTime: true,
|
|
300
|
+
endTime: true,
|
|
301
|
+
color: true,
|
|
302
|
+
},
|
|
303
|
+
},
|
|
304
|
+
};
|
|
305
|
+
|
|
306
|
+
/** Attach assignment to event. */
|
|
307
|
+
export function attachAssignmentToEvent(assignmentId: string, eventId: string) {
|
|
308
|
+
return prisma.assignment.update({
|
|
309
|
+
where: { id: assignmentId },
|
|
310
|
+
data: { eventAttached: { connect: { id: eventId } } },
|
|
311
|
+
include: assignmentAttachEventInclude,
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
/** Detach assignment from event. */
|
|
316
|
+
export function detachAssignmentFromEvent(assignmentId: string) {
|
|
317
|
+
return prisma.assignment.update({
|
|
318
|
+
where: { id: assignmentId },
|
|
319
|
+
data: { eventAttached: { disconnect: true } },
|
|
320
|
+
include: assignmentAttachEventInclude,
|
|
321
|
+
});
|
|
322
|
+
}
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Attendance model – attendance records, present/late/absent students per event.
|
|
3
|
+
*/
|
|
4
|
+
import { prisma } from "../lib/prisma.js";
|
|
5
|
+
|
|
6
|
+
const attendanceInclude = {
|
|
7
|
+
event: {
|
|
8
|
+
select: {
|
|
9
|
+
id: true,
|
|
10
|
+
name: true,
|
|
11
|
+
startTime: true,
|
|
12
|
+
endTime: true,
|
|
13
|
+
location: true,
|
|
14
|
+
color: true,
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
present: {
|
|
18
|
+
select: {
|
|
19
|
+
id: true,
|
|
20
|
+
username: true,
|
|
21
|
+
profile: {
|
|
22
|
+
select: {
|
|
23
|
+
displayName: true,
|
|
24
|
+
profilePicture: true,
|
|
25
|
+
profilePictureThumbnail: true,
|
|
26
|
+
bio: true,
|
|
27
|
+
location: true,
|
|
28
|
+
website: true,
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
late: {
|
|
34
|
+
select: {
|
|
35
|
+
id: true,
|
|
36
|
+
username: true,
|
|
37
|
+
profile: {
|
|
38
|
+
select: {
|
|
39
|
+
displayName: true,
|
|
40
|
+
profilePicture: true,
|
|
41
|
+
profilePictureThumbnail: true,
|
|
42
|
+
bio: true,
|
|
43
|
+
location: true,
|
|
44
|
+
website: true,
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
absent: {
|
|
50
|
+
select: {
|
|
51
|
+
id: true,
|
|
52
|
+
username: true,
|
|
53
|
+
profile: {
|
|
54
|
+
select: {
|
|
55
|
+
displayName: true,
|
|
56
|
+
profilePicture: true,
|
|
57
|
+
profilePictureThumbnail: true,
|
|
58
|
+
bio: true,
|
|
59
|
+
location: true,
|
|
60
|
+
website: true,
|
|
61
|
+
},
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
} as const;
|
|
66
|
+
|
|
67
|
+
const attendanceUpdateInclude = {
|
|
68
|
+
event: {
|
|
69
|
+
select: {
|
|
70
|
+
id: true,
|
|
71
|
+
name: true,
|
|
72
|
+
startTime: true,
|
|
73
|
+
endTime: true,
|
|
74
|
+
location: true,
|
|
75
|
+
},
|
|
76
|
+
},
|
|
77
|
+
present: { select: { id: true, username: true } },
|
|
78
|
+
late: { select: { id: true, username: true } },
|
|
79
|
+
absent: { select: { id: true, username: true } },
|
|
80
|
+
} as const;
|
|
81
|
+
|
|
82
|
+
/** @returns Class with students for attendance. */
|
|
83
|
+
export function findClassWithStudents(classId: string) {
|
|
84
|
+
return prisma.class.findUnique({
|
|
85
|
+
where: { id: classId },
|
|
86
|
+
select: {
|
|
87
|
+
id: true,
|
|
88
|
+
students: {
|
|
89
|
+
select: {
|
|
90
|
+
id: true,
|
|
91
|
+
username: true,
|
|
92
|
+
profile: {
|
|
93
|
+
select: {
|
|
94
|
+
displayName: true,
|
|
95
|
+
profilePicture: true,
|
|
96
|
+
profilePictureThumbnail: true,
|
|
97
|
+
bio: true,
|
|
98
|
+
location: true,
|
|
99
|
+
website: true,
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** @returns Class if user is a teacher. */
|
|
109
|
+
export function findClassWithTeacher(classId: string, teacherId: string) {
|
|
110
|
+
return prisma.class.findUnique({
|
|
111
|
+
where: {
|
|
112
|
+
id: classId,
|
|
113
|
+
teachers: { some: { id: teacherId } },
|
|
114
|
+
},
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** @returns Events for a class. */
|
|
119
|
+
export function findEventsByClassId(classId: string) {
|
|
120
|
+
return prisma.event.findMany({
|
|
121
|
+
where: { classId },
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/** @returns Attendance record for an event. */
|
|
126
|
+
export function findAttendanceByEventId(eventId: string) {
|
|
127
|
+
return prisma.attendance.findFirst({
|
|
128
|
+
where: { eventId },
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/** @returns Attendance for class and event (eventId null = class-level). */
|
|
133
|
+
export function findAttendanceByClassAndEvent(classId: string, eventId: string | null) {
|
|
134
|
+
return prisma.attendance.findFirst({
|
|
135
|
+
where: {
|
|
136
|
+
classId,
|
|
137
|
+
eventId,
|
|
138
|
+
},
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** @returns Attendance records for class, optionally filtered by event. */
|
|
143
|
+
export function findManyAttendance(classId: string, eventId?: string) {
|
|
144
|
+
return prisma.attendance.findMany({
|
|
145
|
+
where: {
|
|
146
|
+
classId,
|
|
147
|
+
...(eventId ? { eventId } : {}),
|
|
148
|
+
},
|
|
149
|
+
include: attendanceInclude,
|
|
150
|
+
orderBy: { date: "desc" },
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/** Create an attendance record. */
|
|
155
|
+
export function createAttendance(data: {
|
|
156
|
+
classId: string;
|
|
157
|
+
eventId?: string | null;
|
|
158
|
+
presentIds: string[];
|
|
159
|
+
lateIds?: string[];
|
|
160
|
+
absentIds?: string[];
|
|
161
|
+
}) {
|
|
162
|
+
return prisma.attendance.create({
|
|
163
|
+
data: {
|
|
164
|
+
classId: data.classId,
|
|
165
|
+
eventId: data.eventId ?? undefined,
|
|
166
|
+
date: new Date(),
|
|
167
|
+
present: { connect: data.presentIds.map((id) => ({ id })) },
|
|
168
|
+
late: data.lateIds?.length
|
|
169
|
+
? { connect: data.lateIds.map((id) => ({ id })) }
|
|
170
|
+
: undefined,
|
|
171
|
+
absent: data.absentIds?.length
|
|
172
|
+
? { connect: data.absentIds.map((id) => ({ id })) }
|
|
173
|
+
: undefined,
|
|
174
|
+
},
|
|
175
|
+
include: attendanceUpdateInclude,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/** Create attendance for a specific event. */
|
|
180
|
+
export function createAttendanceForEvent(data: {
|
|
181
|
+
classId: string;
|
|
182
|
+
eventId: string;
|
|
183
|
+
presentIds: string[];
|
|
184
|
+
}) {
|
|
185
|
+
return prisma.attendance.create({
|
|
186
|
+
data: {
|
|
187
|
+
class: { connect: { id: data.classId } },
|
|
188
|
+
event: { connect: { id: data.eventId } },
|
|
189
|
+
present: { connect: data.presentIds.map((id) => ({ id })) },
|
|
190
|
+
},
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/** Update attendance present/late/absent lists. */
|
|
195
|
+
export function updateAttendance(
|
|
196
|
+
id: string,
|
|
197
|
+
data: { presentIds: string[]; lateIds: string[]; absentIds: string[] }
|
|
198
|
+
) {
|
|
199
|
+
return prisma.attendance.update({
|
|
200
|
+
where: { id },
|
|
201
|
+
data: {
|
|
202
|
+
present: { set: data.presentIds.map((id) => ({ id })) },
|
|
203
|
+
late: { set: data.lateIds.map((id) => ({ id })) },
|
|
204
|
+
absent: { set: data.absentIds.map((id) => ({ id })) },
|
|
205
|
+
},
|
|
206
|
+
include: attendanceUpdateInclude,
|
|
207
|
+
});
|
|
208
|
+
}
|