From c1976b0a9c6b411a7fde624896cb29586695327b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 12:46:40 +0000 Subject: [PATCH 01/10] Initial plan From 8868b74dc705f1d85c9a726a794a438143a0a360 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 12:57:28 +0000 Subject: [PATCH 02/10] Fix data.sql date format issues and add typeorm_metadata table Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/db/data.sql b/db/data.sql index ea7ff216..a7f6feb9 100644 --- a/db/data.sql +++ b/db/data.sql @@ -521,9 +521,9 @@ INSERT INTO `grades` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId (10, 3, 5786, '101010101', 10, '890123456', 8, 8, 8, 8, 8, '2025-10-17', 10, 94.0, 'Excellent'), (11, 1, 5786, '111111111', 1, '234567890', 2, 1, 1, 2, 2, '2025-10-20', 12, 89.5, 'Very Good'), (12, 1, 5786, '333333333', 3, '345678901', 3, 2, 2, 3, 3, '2025-10-20', 10, 96.0, 'Outstanding'), -(13, 2, 5786, '666666666', 6, '567890123', 5, 4, 4, 5, 5, '5786-10-21', 9, 86.0, 'Good'), -(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '5786-10-22', 9, 91.5, 'Excellent'), -(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '5786-10-23', 12, 88.5, 'Very Good'); +(13, 2, 5786, '666666666', 6, '567890123', 5, 4, 4, 5, 5, '2025-10-21', 9, 86.0, 'Good'), +(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '2025-10-22', 9, 91.5, 'Excellent'), +(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '2025-10-23', 12, 88.5, 'Very Good'); -- ============================================================ -- Table: known_absences @@ -725,6 +725,22 @@ INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDa (9, 2, 4, '2025-10-18', '09:00:00', '10:30:00', 'Photosynthesis'), (10, 2, 5, '2025-10-19', '11:00:00', '12:30:00', 'Control structures'); +-- ============================================================ +-- Table: typeorm_metadata +-- TypeORM metadata for generated columns and other metadata +-- ============================================================ +DROP TABLE IF EXISTS `typeorm_metadata`; +CREATE TABLE `typeorm_metadata` ( + `type` varchar(255) NOT NULL, + `schema` varchar(255) DEFAULT NULL, + `table` varchar(255) DEFAULT NULL, + `name` varchar(255) DEFAULT NULL, + `value` text +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `typeorm_metadata` (`type`, `schema`, `table`, `name`, `value`) VALUES +('GENERATED_COLUMN', 'mysql_database', 'lessons', 'klass_reference_ids_json', 'CAST(CONCAT(''['', COALESCE(klassReferenceIds, ''''), '']'') AS JSON)'); + SET FOREIGN_KEY_CHECKS = 1; -- ============================================================ From 9b7d1861a3b0efbe79ea22f2f5985826fef58128 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 13:27:26 +0000 Subject: [PATCH 03/10] Update data.sql with timestamp(0) precision and remove erroneous isReverted columns Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 94 ++- db/data.sql.backup | 1441 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1487 insertions(+), 48 deletions(-) create mode 100644 db/data.sql.backup diff --git a/db/data.sql b/db/data.sql index a7f6feb9..7f435384 100644 --- a/db/data.sql +++ b/db/data.sql @@ -160,8 +160,8 @@ CREATE TABLE `users` ( `password` varchar(500) DEFAULT NULL, `phone_number` varchar(11) DEFAULT NULL, `active` tinyint DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `effective_id` int DEFAULT NULL, `permissions` json DEFAULT NULL, `additionalData` json DEFAULT NULL, @@ -200,8 +200,8 @@ CREATE TABLE `teachers` ( `email` varchar(500) DEFAULT NULL, `comment` varchar(1000) DEFAULT NULL, `displayName` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_teachers_user_tz_year` (`user_id`, `tz`, `year`), KEY `teachers_users_idx` (`user_id`), @@ -236,8 +236,8 @@ CREATE TABLE `students` ( `phone` varchar(1000) DEFAULT NULL, `address` varchar(1000) DEFAULT NULL, `is_active` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_students_user_tz_year` (`user_id`, `tz`, `year`), KEY `students_users_idx` (`user_id`) @@ -273,8 +273,8 @@ CREATE TABLE `klass_types` ( `klassTypeEnum` varchar(255) NOT NULL DEFAULT 'אחר', `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `klass_types_users_idx` (`user_id`), KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) @@ -308,8 +308,8 @@ CREATE TABLE `klasses` ( `klassTypeReferenceId` int DEFAULT NULL, `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_klasses_user_key_year` (`user_id`, `key`, `year`), KEY `klasses_users_idx` (`user_id`), @@ -352,8 +352,8 @@ CREATE TABLE `lessons` ( `comment` varchar(1000) DEFAULT NULL, `how_many_lessons` float DEFAULT NULL, `order` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_lessons_user_key_year` (`user_id`, `key`, `year`), KEY `lessons_users_idx` (`user_id`), @@ -386,8 +386,8 @@ CREATE TABLE `student_klasses` ( `studentReferenceId` int DEFAULT NULL, `klass_id` int DEFAULT NULL, `klassReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `student_klasses_users_idx` (`user_id`), KEY `student_klasses_user_year_idx` (`user_id`, `year`), @@ -438,8 +438,8 @@ CREATE TABLE `att_reports` ( `comments` varchar(500) DEFAULT NULL, `sheet_name` varchar(100) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `att_users_idx` (`user_id`), KEY `att_user_sheet_name_lession_klass_year_idx` (`user_id`, `sheet_name`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -495,8 +495,8 @@ CREATE TABLE `grades` ( `estimation` varchar(500) DEFAULT NULL, `comments` varchar(500) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `grades_users_idx` (`user_id`), KEY `grades_user_lesson_klass_year_idx` (`user_id`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -547,8 +547,8 @@ CREATE TABLE `known_absences` ( `reason` varchar(500) DEFAULT NULL, `comment` varchar(500) DEFAULT NULL, `isApproved` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `known_users_idx` (`user_id`), KEY `IDX_known_absences_studentReferenceId_year` (`studentReferenceId`, `year`), @@ -581,8 +581,8 @@ CREATE TABLE `report_month` ( `semester` varchar(255) NOT NULL DEFAULT 'שנתי', `year` int DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `report_month_user_id_idx` (`userId`), KEY `report_month_user_id_start_date_end_date_idx` (`userId`, `startDate`, `endDate`), @@ -612,8 +612,8 @@ CREATE TABLE `grade_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `grade_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -640,8 +640,8 @@ CREATE TABLE `attendance_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `attendance_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -673,9 +673,8 @@ CREATE TABLE `report_groups` ( `lessonReferenceId` int DEFAULT NULL, `klassReferenceId` int DEFAULT NULL, `year` int DEFAULT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `report_groups_user_id_idx` (`user_id`), KEY `report_groups_user_id_year_idx` (`user_id`, `year`), @@ -704,8 +703,7 @@ CREATE TABLE `report_group_sessions` ( `startTime` time DEFAULT NULL, `endTime` time DEFAULT NULL, `topic` varchar(255) DEFAULT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `report_group_sessions_user_id_idx` (`userId`), KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), @@ -787,8 +785,8 @@ CREATE TABLE `texts` ( `description` varchar(500) NOT NULL, `value` varchar(10000) NOT NULL, `filepath` varchar(255) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `texts_users_idx` (`user_id`), KEY `texts_name_idx` (`name`), @@ -813,7 +811,7 @@ CREATE TABLE `audit_log` ( `operation` varchar(255) NOT NULL, `entityData` text NOT NULL, `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -837,8 +835,8 @@ CREATE TABLE `yemot_call` ( `isOpen` tinyint NOT NULL, `hasError` tinyint NOT NULL DEFAULT 0, `errorMessage` varchar(255) DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `yemot_call_api_call_id_idx` (`apiCallId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -853,8 +851,8 @@ CREATE TABLE `mail_address` ( `userId` int NOT NULL, `alias` varchar(255) NOT NULL, `entity` varchar(255) NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_mail_address_userId_entity` (`userId`, `entity`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -874,7 +872,7 @@ CREATE TABLE `recieved_mail` ( `body` text DEFAULT NULL, `entityName` varchar(255) NOT NULL, `importFileIds` text NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -888,8 +886,8 @@ CREATE TABLE `page` ( `description` varchar(255) NOT NULL, `value` longtext NOT NULL, `order` int DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -904,8 +902,8 @@ CREATE TABLE `image` ( `fileDataSrc` mediumtext NOT NULL, `fileDataTitle` text NOT NULL, `imageTarget` varchar(255) NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `IDX_image_userId_imageTarget` (`userId`, `imageTarget`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -922,8 +920,8 @@ CREATE TABLE `payment_track` ( `monthlyPrice` int NOT NULL, `annualPrice` int NOT NULL, `studentNumberLimit` int NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -947,7 +945,7 @@ CREATE TABLE `import_file` ( `fullSuccess` tinyint(1) DEFAULT NULL, `response` varchar(255) DEFAULT NULL, `metadata` json DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -962,8 +960,8 @@ CREATE TABLE `att_grade_effect` ( `percents` int DEFAULT NULL, `count` int DEFAULT NULL, `effect` int NOT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `att_grade_effect_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/db/data.sql.backup b/db/data.sql.backup new file mode 100644 index 00000000..a7f6feb9 --- /dev/null +++ b/db/data.sql.backup @@ -0,0 +1,1441 @@ +-- MySQL Database Initialization Script +-- Generated for react-admin-nestjs project +-- This script creates all tables and populates them with sample data + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ============================================================ +-- Table: migrations +-- Stores migration history +-- ============================================================ +DROP TABLE IF EXISTS `migrations`; +CREATE TABLE `migrations` ( + `id` int NOT NULL AUTO_INCREMENT, + `timestamp` bigint NOT NULL, + `name` varchar(255) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `migrations` (`timestamp`, `name`) VALUES +(1675356165986, 'KlassAddReferenceId1675356165986'), +(1675366584689, 'KlassAddKlassTypeReferenceId1675366584689'), +(1676234639701, 'addManyReferenceId1676234639701'), +(1676319747789, 'addAuditLog1676319747789'), +(1676373585567, 'updateStudentBaseKlass1676373585567'), +(1676973723497, 'addImportFileTable1676973723497'), +(1679387546635, 'fixLessonReferenceId1679387546635'), +(1679433140359, 'addMailAddressTable1679433140359'), +(1679606124656, 'addHandleEmailData1679606124656'), +(1679607283312, 'updateHandleEmailData1679607283312'), +(1681588431337, 'recievedMailNullableColumns1681588431337'), +(1682255853138, 'addUserInfoColumn1682255853138'), +(1682613070027, 'fixKlassType1682613070027'), +(1682885643767, 'updateNullableFields1682885643767'), +(1682967271092, 'updateDateFields1682967271092'), +(1682968919553, 'addPageTable1682968919553'), +(1683142771777, 'removePathAddOrderPagesTable1683142771777'), +(1683527164577, 'rerunReferenceIdForProd1683527164577'), +(1684139644957, 'addReportMonthsTable1684139644957'), +(1684164901088, 'createTeacherReportStatusViews1684164901088'), +(1684165648031, 'addIdToTeacherReportStatusView1684165648031'), +(1684165883070, 'updateIdToTeacherReportStatusView1684165883070'), +(1684219765661, 'addJoinsToTeacherReportStatus1684219765661'), +(1684223659058, 'addKlassReferenceIdForLessons1684223659058'), +(1684406609710, 'updateStudentKlassReeportReference1684406609710'), +(1684407026417, 'updateStudentKlassReeportJoinStudents1684407026417'), +(1684693416581, 'addUserPaymentInfo1684693416581'), +(1684694518104, 'addUserSendMailFromInfo1684694518104'), +(1684842208464, 'addTextByUserView1684842208464'), +(1684852538625, 'addUserIdToTextByUserView1684852538625'), +(1686680413320, 'updateStudentBaseKlassReportJoinConditions1686680413320'), +(1686757018415, 'addAttReportAndGradeView1686757018415'), +(1686757929196, 'addStudentGlobalReportView1686757929196'), +(1686758604957, 'fixStudentGlobalReportView1686758604957'), +(1686766165368, 'addStudentPercentReportView1686766165368'), +(1686766691647, 'changeStudentPercentReportViewUpdatePercentCalc1686766691647'), +(1686766743345, 'changeStudentPercentReportViewUpdateGradeCalc1686766743345'), +(1687115195304, 'addYearToTeacherStatusReports1687115195304'), +(1687171083496, 'fillCurrentYearOnTables1687171083496'), +(1688581442248, 'updateStudentGlobalReportFixIdOnNull1688581442248'), +(1689189688623, 'updateStudentsAddCommentColumn1689189688623'), +(1689619350360, 'updateTeacherLessonReportStatusViewAddLessonConditions1689619350360'), +(1689856702136, 'addImageTable1689856702136'), +(1693688366912, 'addStudentByYearView1693688366912'), +(1693721982777, 'updateStudentByYearYearColumn1693721982777'), +(1693827099474, 'addPaymentTrackTable1693827099474'), +(1694374542167, 'addCommentToLessons1694374542167'), +(1694450301604, 'addTeacherInKlassTypeTable1694450301604'), +(1695290797452, 'updateYemotCallIncreaseHistoryLength1695290797452'), +(1695364381711, 'addIndexesForYemotCall1695364381711'), +(1696873095052, 'addTeacherSalaryReportView1696873095052'), +(1696873773338, 'updateTeacherSalaryReportView1696873773338'), +(1696875067298, 'updateViewsIds1696875067298'), +(1696875184214, 'updateViewsIdsAgain1696875184214'), +(1696879784006, 'updateStudentKlassReportAddKlassReferenceIdColumns1696879784006'), +(1696879935960, 'updateStudentKlassReportUpdateKlassReferenceIdColumns1696879935960'), +(1698175230064, 'updateTeacherReportStatusViewIdToIncludeYear1698175230064'), +(1698308766347, 'updateTeacherReportStatusViewAddLessonNameColumns1698308766347'), +(1698309566758, 'createAttReportWithReportMonthView1698309566758'), +(1698309810693, 'updateTeacherSalaryReportToUseAttReportWithReportMonth1698309810693'), +(1698310278655, 'updateTeacherLessonReportStatusToUseAttReportWithReportMonth1698310278655'), +(1698310976879, 'cosmeticChangesToViews1698310976879'), +(1698650715375, 'schemantics1698650715375'), +(1698650838088, 'updateStudentByYearToIncludeKlassIds1698650838088'), +(1698775162074, 'cosmeticChangesToViews1698775162074'), +(1698775288010, 'addSemesterToReportMonth1698775288010'), +(1698821603832, 'adColumnsToKnownAbsences1698821603832'), +(1698822192680, 'addKnownAbsenceWithReportMonthView1698822192680'), +(1699903001380, 'addKlassTypeReferenceIDsToStudentByYearView1699903001380'), +(1700683658614, 'makeAttReportAbsDecimal1700683658614'), +(1701162232786, 'removeTzFromStudentBaseKlassView1701162232786'), +(1701795323207, 'addIndexesToOptimizeTeacherReport1701795323207'), +(1702474127872, 'makeIsBaseKlassToStudentGlobalReport1702474127872'), +(1702580912725, 'addGradeNameAndAttGradeEffect1702580912725'), +(1702802919133, 'simplifyStudentKlassReportViewJoins1702802919133'), +(1703363342429, 'addEstimationToGrades1703363342429'), +(1704207273135, 'addDefaultYearToKnownAbsences1704207273135'), +(1705432003726, 'addTeacherGradeReportFileViews1705432003726'), +(1705609443991, 'addNumbersTable1705609443991'), +(1705777705679, 'adGradeEffectByUserView1705777705679'), +(1705938484628, 'addAbsCountEffectByUserView1705938484628'), +(1706608882654, 'addUserBccAddress1706608882654'), +(1706794821688, 'addStudentIndexes1706794821688'), +(1707032874492, 'makeGradeNameNullable1707032874492'), +(1707244388438, 'changeGradeToBeDecimal1707244388438'), +(1707765928446, 'addFullSuccessToImportFile1707765928446'), +(1708371629107, 'updateAttAndGradeViewAddEstimation1708371629107'), +(1708547027795, 'addAttReportIndexes1708547027795'), +(1708547635746, 'optimizeStudentBaseKlass1708547635746'), +(1708945273022, 'renameAllIndexes1708945273022'), +(1711026137081, 'makeLessonsColumnFloat1711026137081'), +(1723317958090, 'updateStudentsAddPhoneAndAddress1723317958090'), +(1723482751870, 'updateStudentKlassesReportAddStudentDetails1723482751870'), +(1727203045203, 'addYearToReportMonth1727203045203'), +(1727206071127, 'filterTeacherReportStatusByYear1727206071127'), +(1727331114248, 'addIsRevertedToAuditLog1727331114248'), +(1732025737420, 'addImportFileTable1732025737420'), +(1733151063542, 'addLessonKlassNameView1733151063542'), +(1734522156070, 'addTeacherDisplayName1734522156070'), +(1736169980504, 'addHowManyLessonsToLesson1736169980504'), +(1737837325989, 'addStudentSpecialityView1737837325989'), +(1742452916412, 'addDisplayNameToLessonAndKlass1742452916412'), +(1742461073150, 'addOrderToLessons1742461073150'), +(1743061002171, 'updateDisplayNameNullable1743061002171'), +(1748362072638, 'UpdateTablesAndViews1748362072638'), +(1748362190659, 'AddAttendanceNameTable1748362190659'), +(1749152815025, 'AddIsActiveToStudent1749152815025'), +(1749155415113, 'AddIsActiveToStudentByYear1749155415113'), +(1750016064850, 'UpdateGradeEffectViews1750016064850'), +(1753703108793, 'updateGradeEffectViews1753703108793'), +(1753706287556, 'updateGradeEffectViewsEffectNumeric1753706287556'), +(1757191402580, 'UpdateStudentKlassReportViewAddStudentReferenceId1757191402580'), +(1757865082803, 'AddFilePathToText1757865082803'), +(1759248397724, 'AddMetadataToImportFile1759248397724'), +(1761669384732, 'UpdateLessonTimeToStartTime1761669384732'), +(1762113630653, 'AddReportGroups1762113630653'), +(1762116200000, 'MigrateExistingReportsToGroups1762116200000'), +(1762188353979, 'removeReportGroupFromImportFile1762188353979'), +(1762278302946, 'AddUserIdToReportGroupSession1762278302946'), +(1762282737170, 'recreateAttReportWithReportMonth1762282737170'), +(1762283756079, 'regenerateReportGroupSessions1762283756079'), +(1763834256494, 'optimizeLessonKlassNameView1763834256494'), +(1763931783912, 'OptimizeLessonKlassJoin1763931783912'), +(1763933862682, 'OptimizeLessonKlassJsonTable1763933862682'), +(1767646406606, 'FixImportFileSchema1767646406606'), +(1767647010979, 'FixAttReportView1767647010979'), +(1767647010980, 'FixAllViews1767647010980'), +(1767647702833, 'FixDataDatesAndOverlaps1767647702833'), +(1767647800000, 'FixSchemaMisalignments1767647800000'); + +-- ============================================================ +-- Table: users +-- Main users table +-- ============================================================ +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(500) NOT NULL, + `email` varchar(500) DEFAULT NULL, + `password` varchar(500) DEFAULT NULL, + `phone_number` varchar(11) DEFAULT NULL, + `active` tinyint DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `effective_id` int DEFAULT NULL, + `permissions` json DEFAULT NULL, + `additionalData` json DEFAULT NULL, + `userInfo` json DEFAULT NULL, + `isPaid` tinyint(1) NOT NULL DEFAULT '0', + `paymentMethod` varchar(255) DEFAULT NULL, + `mailAddressAlias` varchar(255) DEFAULT NULL, + `mailAddressTitle` varchar(255) DEFAULT NULL, + `paymentTrackId` int DEFAULT NULL, + `bccAddress` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `user_phone_number_idx` (`phone_number`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- Password: admin123 (hashed with bcrypt) +INSERT INTO `users` (`id`, `name`, `email`, `password`, `phone_number`, `active`, `isPaid`) VALUES +(1, 'Admin User', 'admin@example.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0501234567', 1, 1), +(2, 'School Manager', 'manager@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0507654321', 1, 1), +(3, 'Test Teacher User', 'teacher@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0509876543', 1, 0), +(4, 'Data Entry User', 'dataentry@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0502468135', 1, 1), +(5, 'Principal User', 'principal@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0503691472', 1, 1); + +-- ============================================================ +-- Table: teachers +-- Teachers information +-- ============================================================ +DROP TABLE IF EXISTS `teachers`; +CREATE TABLE `teachers` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `tz` varchar(10) NOT NULL, + `name` varchar(500) NOT NULL, + `phone` varchar(10) DEFAULT NULL, + `phone2` varchar(10) DEFAULT NULL, + `email` varchar(500) DEFAULT NULL, + `comment` varchar(1000) DEFAULT NULL, + `displayName` varchar(500) DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_teachers_user_tz_year` (`user_id`, `tz`, `year`), + KEY `teachers_users_idx` (`user_id`), + KEY `teachers_user_id_phone_idx` (`user_id`, `phone`), + KEY `teachers_user_id_phone2_idx` (`user_id`, `phone2`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `teachers` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `phone2`, `email`, `displayName`) VALUES +(1, 1, 5786, '123456789', 'Sarah Cohen', '0501111111', '0502222222', 'sarah@school.com', 'Ms. Cohen'), +(2, 1, 5786, '234567890', 'Rachel Levi', '0503333333', NULL, 'rachel@school.com', 'Ms. Levi'), +(3, 1, 5786, '345678901', 'Miriam Goldberg', '0504444444', '0505555555', 'miriam@school.com', 'Ms. Goldberg'), +(4, 2, 5786, '456789012', 'David Klein', '0506666666', NULL, 'david@school.com', 'Mr. Klein'), +(5, 2, 5786, '567890123', 'Yael Schwartz', '0507777777', NULL, 'yael@school.com', 'Ms. Schwartz'), +(6, 1, 5786, '678901234', 'Esther Rosenberg', '0508888888', '0509999999', 'esther@school.com', 'Ms. Rosenberg'), +(7, 2, 5786, '789012345', 'Tamar Friedman', '0501231231', NULL, 'tamar@school.com', 'Ms. Friedman'), +(8, 1, 5786, '890123456', 'Leah Katz', '0502342342', NULL, 'leah@school.com', 'Ms. Katz'), +(9, 3, 5786, '901234567', 'Chana Weiss', '0503453453', NULL, 'chana@school.com', 'Ms. Weiss'), +(10, 3, 5786, '012345678', 'Rivka Stein', '0504564564', '0505675675', 'rivka@school.com', 'Ms. Stein'); + +-- ============================================================ +-- Table: students +-- Students information +-- ============================================================ +DROP TABLE IF EXISTS `students`; +CREATE TABLE `students` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `tz` varchar(10) NOT NULL, + `name` varchar(500) NOT NULL, + `comment` varchar(1000) DEFAULT NULL, + `phone` varchar(1000) DEFAULT NULL, + `address` varchar(1000) DEFAULT NULL, + `is_active` tinyint(1) NOT NULL DEFAULT '1', + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_students_user_tz_year` (`user_id`, `tz`, `year`), + KEY `students_users_idx` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `students` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `address`, `is_active`) VALUES +(1, 1, 5786, '111111111', 'Avigail Abramson', '0521111111', '123 Main St, Jerusalem', 1), +(2, 1, 5786, '222222222', 'Bracha Ben-David', '0522222222', '456 Oak Ave, Tel Aviv', 1), +(3, 1, 5786, '333333333', 'Chaya Cohen', '0523333333', '789 Pine Rd, Haifa', 1), +(4, 1, 5786, '444444444', 'Devorah Dayan', '0524444444', '321 Elm St, Bnei Brak', 1), +(5, 1, 5786, '555555555', 'Elisheva Ezra', '0525555555', '654 Cedar Ln, Netanya', 1), +(6, 2, 5786, '666666666', 'Freida Friedman', '0526666666', '987 Maple Dr, Ashdod', 1), +(7, 2, 5786, '777777777', 'Gittel Goldstein', '0527777777', '147 Birch Ct, Petah Tikva', 1), +(8, 2, 5786, '888888888', 'Hadassah Horowitz', '0528888888', '258 Spruce Way, Ramat Gan', 1), +(9, 1, 5786, '999999999', 'Irit Israel', '0529999999', '369 Willow St, Rehovot', 1), +(10, 3, 5786, '101010101', 'Judith Jacob', '0521010101', '741 Ash Blvd, Herzliya', 1), +(11, 3, 5786, '121212121', 'Kayla Klein', '0521212121', '852 Poplar Rd, Holon', 1), +(12, 2, 5786, '131313131', 'Leah Levy', '0521313131', '963 Chestnut Ave, Bat Yam', 1), +(13, 1, 5786, '141414141', 'Malka Miller', '0521414141', '159 Sycamore Ln, Kfar Saba', 1), +(14, 1, 5786, '151515151', 'Nechama Newman', '0521515151', '357 Redwood Dr, Raanana', 1), +(15, 2, 5786, '161616161', 'Orly Ostrovsky', '0521616161', '486 Hickory Ct, Rishon LeZion', 1); + +-- ============================================================ +-- Table: klass_types +-- Class types (base class, track, speciality, other) +-- ============================================================ +DROP TABLE IF EXISTS `klass_types`; +CREATE TABLE `klass_types` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `key` int NOT NULL, + `name` varchar(500) NOT NULL, + `klassTypeEnum` varchar(255) NOT NULL DEFAULT 'אחר', + `teacher_id` varchar(10) DEFAULT NULL, + `teacherReferenceId` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `klass_types_users_idx` (`user_id`), + KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `klass_types` (`id`, `user_id`, `key`, `name`, `klassTypeEnum`, `teacher_id`, `teacherReferenceId`) VALUES +(1, 1, 1, 'Aleph Class', 'כיתת אם', '123456789', 1), +(2, 1, 2, 'Bet Class', 'כיתת אם', '234567890', 2), +(3, 1, 3, 'Gimel Class', 'כיתת אם', '345678901', 3), +(4, 1, 4, 'Math Track', 'מסלול', NULL, NULL), +(5, 1, 5, 'Science Track', 'מסלול', NULL, NULL), +(6, 2, 6, 'Literature Track', 'מסלול', '456789012', 4), +(7, 2, 7, 'Computer Science', 'התמחות', '567890123', 5), +(8, 1, 8, 'Arts', 'התמחות', '678901234', 6), +(9, 1, 9, 'Music', 'התמחות', NULL, NULL), +(10, 2, 10, 'Advanced Studies', 'אחר', '789012345', 7); + +-- ============================================================ +-- Table: klasses +-- Classes/Groups +-- ============================================================ +DROP TABLE IF EXISTS `klasses`; +CREATE TABLE `klasses` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `key` int NOT NULL, + `name` varchar(500) NOT NULL, + `display_name` varchar(500) DEFAULT NULL, + `klass_type_id` int DEFAULT NULL, + `klassTypeReferenceId` int DEFAULT NULL, + `teacher_id` varchar(10) DEFAULT NULL, + `teacherReferenceId` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_klasses_user_key_year` (`user_id`, `key`, `year`), + KEY `klasses_users_idx` (`user_id`), + KEY `klasses_user_id_key_idx` (`user_id`, `key`), + KEY `klasses_klass_type_reference_id_idx` (`klassTypeReferenceId`), + KEY `klasses_teacher_reference_id_idx` (`teacherReferenceId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `klasses` (`id`, `user_id`, `year`, `key`, `name`, `display_name`, `klass_type_id`, `klassTypeReferenceId`, `teacher_id`, `teacherReferenceId`) VALUES +(1, 1, 5786, 1, 'Class Aleph-1', 'א-1', 1, 1, '123456789', 1), +(2, 1, 5786, 2, 'Class Aleph-2', 'א-2', 1, 1, '234567890', 2), +(3, 1, 5786, 3, 'Class Bet-1', 'ב-1', 2, 2, '345678901', 3), +(4, 1, 5786, 4, 'Class Bet-2', 'ב-2', 2, 2, '456789012', 4), +(5, 1, 5786, 5, 'Class Gimel-1', 'ג-1', 3, 3, '567890123', 5), +(6, 2, 5786, 6, 'Math Group A', 'Math-A', 4, 4, '678901234', 6), +(7, 2, 5786, 7, 'Math Group B', 'Math-B', 4, 4, '789012345', 7), +(8, 1, 5786, 8, 'Science Group A', 'Sci-A', 5, 5, '890123456', 8), +(9, 1, 5786, 9, 'Literature Group', 'Lit', 6, 6, '901234567', 9), +(10, 2, 5786, 10, 'CS Advanced', 'CS-Adv', 7, 7, '012345678', 10); + +-- ============================================================ +-- Table: lessons +-- Lessons/Courses +-- ============================================================ +DROP TABLE IF EXISTS `lessons`; +CREATE TABLE `lessons` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `key` int NOT NULL, + `name` varchar(500) NOT NULL, + `display_name` varchar(500) DEFAULT NULL, + `klasses` varchar(450) DEFAULT NULL, + `klassReferenceIds` text, + `klass_reference_ids_json` json GENERATED ALWAYS AS (cast(concat('[',coalesce(`klassReferenceIds`,''),']') as json)) STORED, + `teacher_id` varchar(10) DEFAULT NULL, + `teacherReferenceId` int DEFAULT NULL, + `start_date` date DEFAULT NULL, + `end_date` date DEFAULT NULL, + `comment` varchar(1000) DEFAULT NULL, + `how_many_lessons` float DEFAULT NULL, + `order` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_lessons_user_key_year` (`user_id`, `key`, `year`), + KEY `lessons_users_idx` (`user_id`), + KEY `lessons_user_id_key_idx` (`user_id`, `key`), + KEY `lessons_teacher_reference_id_idx` (`teacherReferenceId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `lessons` (`id`, `user_id`, `year`, `key`, `name`, `display_name`, `klasses`, `klassReferenceIds`, `teacher_id`, `teacherReferenceId`, `start_date`, `end_date`, `how_many_lessons`, `order`) VALUES +(1, 1, 5786, 1, 'Mathematics', 'Math', '1,2', '1,2', '123456789', 1, '2025-09-01', '2025-12-31', 40, 1), +(2, 1, 5786, 2, 'Hebrew', 'Hebrew', '1,2,3', '1,2,3', '234567890', 2, '2025-09-01', '2025-12-31', 45, 2), +(3, 1, 5786, 3, 'English', 'English', '3,4', '3,4', '345678901', 3, '2025-09-01', '2025-12-31', 38, 3), +(4, 1, 5786, 4, 'Science', 'Science', '5', '5', '456789012', 4, '2025-09-01', '2025-12-31', 42, 4), +(5, 1, 5786, 5, 'History', 'History', '4,5', '4,5', '567890123', 5, '2025-09-01', '2025-12-31', 35, 5), +(6, 2, 5786, 6, 'Geography', 'Geo', '6,7', '6,7', '678901234', 6, '2025-09-01', '2025-12-31', 30, 6), +(7, 2, 5786, 7, 'Computer Studies', 'CS', '10', '10', '789012345', 7, '2025-09-01', '2025-12-31', 48, 7), +(8, 1, 5786, 8, 'Literature', 'Lit', '9', '9', '890123456', 8, '2025-09-01', '2025-12-31', 36, 8), +(9, 1, 5786, 9, 'Physics', 'Physics', '8', '8', '901234567', 9, '2025-09-01', '2025-12-31', 44, 9), +(10, 3, 5786, 10, 'Chemistry', 'Chem', '8', '8', '012345678', 10, '2025-09-01', '2025-12-31', 41, 10); + +-- ============================================================ +-- Table: student_klasses +-- Student-Class assignments +-- ============================================================ +DROP TABLE IF EXISTS `student_klasses`; +CREATE TABLE `student_klasses` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `student_tz` varchar(10) DEFAULT NULL, + `studentReferenceId` int DEFAULT NULL, + `klass_id` int DEFAULT NULL, + `klassReferenceId` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `student_klasses_users_idx` (`user_id`), + KEY `student_klasses_user_year_idx` (`user_id`, `year`), + KEY `student_klasses_student_reference_id_year_idx` (`studentReferenceId`, `year`), + KEY `student_klasses_user_klass_year_idx` (`user_id`, `klassReferenceId`, `year`), + KEY `student_klasses_user_student_klass_year_idx` (`user_id`, `studentReferenceId`, `klassReferenceId`, `year`), + KEY `IDX_student_klasses_studentReferenceId_year` (`studentReferenceId`, `year`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `student_klasses` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`) VALUES +(1, 1, 5786, '111111111', 1, 1, 1), +(2, 1, 5786, '222222222', 2, 1, 1), +(3, 1, 5786, '333333333', 3, 2, 2), +(4, 1, 5786, '444444444', 4, 2, 2), +(5, 1, 5786, '555555555', 5, 3, 3), +(6, 2, 5786, '666666666', 6, 4, 4), +(7, 2, 5786, '777777777', 7, 5, 5), +(8, 2, 5786, '888888888', 8, 6, 6), +(9, 1, 5786, '999999999', 9, 7, 7), +(10, 3, 5786, '101010101', 10, 8, 8), +(11, 3, 5786, '121212121', 11, 9, 9), +(12, 2, 5786, '131313131', 12, 10, 10), +(13, 1, 5786, '141414141', 13, 1, 1), +(14, 1, 5786, '151515151', 14, 3, 3), +(15, 2, 5786, '161616161', 15, 5, 5); + +-- ============================================================ +-- Table: att_reports +-- Attendance reports +-- ============================================================ +DROP TABLE IF EXISTS `att_reports`; +CREATE TABLE `att_reports` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `student_tz` varchar(10) DEFAULT NULL, + `studentReferenceId` int DEFAULT NULL, + `teacher_id` varchar(10) DEFAULT NULL, + `teacherReferenceId` int DEFAULT NULL, + `klass_id` int DEFAULT NULL, + `klassReferenceId` int DEFAULT NULL, + `lesson_id` int DEFAULT NULL, + `lessonReferenceId` int DEFAULT NULL, + `report_date` date NOT NULL, + `how_many_lessons` float DEFAULT NULL, + `abs_count` float NOT NULL DEFAULT '0', + `approved_abs_count` float NOT NULL DEFAULT '0', + `comments` varchar(500) DEFAULT NULL, + `sheet_name` varchar(100) DEFAULT NULL, + `reportGroupSessionId` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `att_users_idx` (`user_id`), + KEY `att_user_sheet_name_lession_klass_year_idx` (`user_id`, `sheet_name`, `lessonReferenceId`, `klassReferenceId`, `year`), + KEY `att_user_year_idx` (`user_id`, `year`), + KEY `att_user_year_student_reference_id_idx` (`user_id`, `studentReferenceId`, `year`), + KEY `att_user_year_teacher_reference_id_idx` (`user_id`, `teacherReferenceId`, `year`), + KEY `att_user_year_lesson_reference_id_idx` (`user_id`, `lessonReferenceId`, `year`), + KEY `att_reports_student_reference_id_idx` (`studentReferenceId`), + KEY `att_reports_teacher_reference_id_idx` (`teacherReferenceId`), + KEY `att_reports_klass_reference_id_idx` (`klassReferenceId`), + KEY `att_reports_lesson_reference_id_idx` (`lessonReferenceId`), + KEY `att_reports_report_date_idx` (`report_date`), + KEY `att_reports_report_group_session_id_idx` (`reportGroupSessionId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `att_reports` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `abs_count`, `approved_abs_count`) VALUES +(1, 1, 5786, '111111111', 1, '123456789', 1, 1, 1, 1, 1, '2025-10-01', 2, 0, 0), +(2, 1, 5786, '222222222', 2, '123456789', 1, 1, 1, 1, 1, '2025-10-01', 2, 1, 0), +(3, 1, 5786, '333333333', 3, '234567890', 2, 2, 2, 2, 2, '2025-10-01', 2, 0, 0), +(4, 1, 5786, '444444444', 4, '234567890', 2, 2, 2, 2, 2, '2025-10-01', 2, 0.5, 0.5), +(5, 1, 5786, '555555555', 5, '345678901', 3, 3, 3, 3, 3, '2025-10-01', 2, 0, 0), +(6, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 4, 4, '2025-10-02', 2, 1.5, 1), +(7, 2, 5786, '777777777', 7, '567890123', 5, 5, 5, 5, 5, '2025-10-02', 2, 0, 0), +(8, 2, 5786, '888888888', 8, '678901234', 6, 6, 6, 6, 6, '2025-10-02', 1, 0, 0), +(9, 1, 5786, '999999999', 9, '789012345', 7, 7, 7, 7, 7, '2025-10-03', 2, 2, 0), +(10, 3, 5786, '101010101', 10, '890123456', 8, 8, 8, 8, 8, '2025-10-03', 2, 0, 0), +(11, 1, 5786, '111111111', 1, '234567890', 2, 1, 1, 2, 2, '2025-10-05', 2, 0, 0), +(12, 1, 5786, '333333333', 3, '345678901', 3, 2, 2, 3, 3, '2025-10-05', 2, 1, 1), +(13, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 5, 5, '2025-10-06', 2, 0, 0), +(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '2025-10-07', 2, 0.5, 0), +(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '2025-10-08', 2, 0, 0); + +-- ============================================================ +-- Table: grades +-- Grades/Marks +-- ============================================================ +DROP TABLE IF EXISTS `grades`; +CREATE TABLE `grades` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `student_tz` varchar(10) DEFAULT NULL, + `studentReferenceId` int DEFAULT NULL, + `teacher_id` varchar(10) DEFAULT NULL, + `teacherReferenceId` int DEFAULT NULL, + `klass_id` int DEFAULT NULL, + `klassReferenceId` int DEFAULT NULL, + `lesson_id` int DEFAULT NULL, + `lessonReferenceId` int DEFAULT NULL, + `report_date` date NOT NULL, + `how_many_lessons` float DEFAULT NULL, + `grade` float NOT NULL DEFAULT '0', + `estimation` varchar(500) DEFAULT NULL, + `comments` varchar(500) DEFAULT NULL, + `reportGroupSessionId` int DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `grades_users_idx` (`user_id`), + KEY `grades_user_lesson_klass_year_idx` (`user_id`, `lessonReferenceId`, `klassReferenceId`, `year`), + KEY `grades_student_reference_id_idx` (`studentReferenceId`), + KEY `grades_teacher_reference_id_idx` (`teacherReferenceId`), + KEY `grades_klass_reference_id_idx` (`klassReferenceId`), + KEY `grades_lesson_reference_id_idx` (`lessonReferenceId`), + KEY `grades_report_date_idx` (`report_date`), + KEY `grades_report_group_session_id_idx` (`reportGroupSessionId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `grades` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `grade`, `estimation`) VALUES +(1, 1, 5786, '111111111', 1, '123456789', 1, 1, 1, 1, 1, '2025-10-15', 10, 95.5, 'Excellent'), +(2, 1, 5786, '222222222', 2, '123456789', 1, 1, 1, 1, 1, '2025-10-15', 10, 88.0, 'Very Good'), +(3, 1, 5786, '333333333', 3, '234567890', 2, 2, 2, 2, 2, '2025-10-15', 12, 92.5, 'Excellent'), +(4, 1, 5786, '444444444', 4, '234567890', 2, 2, 2, 2, 2, '2025-10-15', 12, 85.0, 'Good'), +(5, 1, 5786, '555555555', 5, '345678901', 3, 3, 3, 3, 3, '2025-10-15', 10, 90.0, 'Very Good'), +(6, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 4, 4, '2025-10-16', 11, 93.5, 'Excellent'), +(7, 2, 5786, '777777777', 7, '567890123', 5, 5, 5, 5, 5, '2025-10-16', 9, 87.5, 'Very Good'), +(8, 2, 5786, '888888888', 8, '678901234', 6, 6, 6, 6, 6, '2025-10-16', 8, 91.0, 'Excellent'), +(9, 1, 5786, '999999999', 9, '789012345', 7, 7, 7, 7, 7, '2025-10-17', 12, 78.5, 'Good'), +(10, 3, 5786, '101010101', 10, '890123456', 8, 8, 8, 8, 8, '2025-10-17', 10, 94.0, 'Excellent'), +(11, 1, 5786, '111111111', 1, '234567890', 2, 1, 1, 2, 2, '2025-10-20', 12, 89.5, 'Very Good'), +(12, 1, 5786, '333333333', 3, '345678901', 3, 2, 2, 3, 3, '2025-10-20', 10, 96.0, 'Outstanding'), +(13, 2, 5786, '666666666', 6, '567890123', 5, 4, 4, 5, 5, '2025-10-21', 9, 86.0, 'Good'), +(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '2025-10-22', 9, 91.5, 'Excellent'), +(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '2025-10-23', 12, 88.5, 'Very Good'); + +-- ============================================================ +-- Table: known_absences +-- Known/Approved absences +-- ============================================================ +DROP TABLE IF EXISTS `known_absences`; +CREATE TABLE `known_absences` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `year` int DEFAULT NULL, + `student_tz` varchar(10) DEFAULT NULL, + `studentReferenceId` int DEFAULT NULL, + `klass_id` int DEFAULT NULL, + `klassReferenceId` int DEFAULT NULL, + `lesson_id` int DEFAULT NULL, + `lessonReferenceId` int DEFAULT NULL, + `report_date` date NOT NULL, + `absnce_count` int DEFAULT NULL, + `absnce_code` int DEFAULT NULL, + `sender_name` varchar(100) DEFAULT NULL, + `reason` varchar(500) DEFAULT NULL, + `comment` varchar(500) DEFAULT NULL, + `isApproved` tinyint(1) NOT NULL DEFAULT '1', + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `known_users_idx` (`user_id`), + KEY `IDX_known_absences_studentReferenceId_year` (`studentReferenceId`, `year`), + KEY `known_absences_student_reference_id_idx` (`studentReferenceId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `known_absences` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `absnce_count`, `absnce_code`, `sender_name`, `reason`, `isApproved`) VALUES +(1, 1, 5786, '222222222', 2, 1, 1, 1, 1, '2025-10-01', 1, 1, 'Parent', 'Medical appointment', 1), +(2, 1, 5786, '444444444', 4, 2, 2, 2, 2, '2025-10-01', 1, 2, 'Parent', 'Family event', 1), +(3, 2, 5786, '666666666', 6, 4, 4, 4, 4, '2025-10-02', 2, 1, 'Doctor', 'Sick', 1), +(4, 1, 5786, '999999999', 9, 7, 7, 7, 7, '2025-10-03', 2, 3, 'Parent', 'Religious holiday', 1), +(5, 1, 5786, '333333333', 3, 2, 2, 3, 3, '2025-10-05', 1, 1, 'Parent', 'Illness', 1), +(6, 2, 5786, '888888888', 8, 7, 7, 7, 7, '2025-10-08', 1, 4, 'School', 'School trip', 1), +(7, 1, 5786, '555555555', 5, 3, 3, 5, 5, '2025-10-07', 1, 2, 'Parent', 'Personal matter', 0), +(8, 1, 5786, '111111111', 1, 1, 1, 1, 1, '2025-10-10', 1, 1, 'Parent', 'Medical checkup', 1), +(9, 2, 5786, '777777777', 7, 5, 5, 5, 5, '2025-10-12', 1, 3, 'Parent', 'Family celebration', 1), +(10, 3, 5786, '121212121', 11, 9, 9, NULL, NULL, '2025-10-14', 1, 1, 'Parent', 'Cold', 1); + +-- ============================================================ +-- Table: report_month +-- Report month periods +-- ============================================================ +DROP TABLE IF EXISTS `report_month`; +CREATE TABLE `report_month` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `name` varchar(255) NOT NULL, + `startDate` date NOT NULL, + `endDate` date NOT NULL, + `semester` varchar(255) NOT NULL DEFAULT 'שנתי', + `year` int DEFAULT NULL, + + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `report_month_user_id_idx` (`userId`), + KEY `report_month_user_id_start_date_end_date_idx` (`userId`, `startDate`, `endDate`), + KEY `report_month_user_id_year_idx` (`userId`, `year`), + KEY `report_month_user_id_start_date_end_date_year_idx` (`userId`, `startDate`, `endDate`, `year`), + KEY `report_month_start_date_idx` (`startDate`), + KEY `report_month_end_date_idx` (`endDate`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `report_month` (`id`, `userId`, `name`, `startDate`, `endDate`, `semester`, `year`) VALUES +(1, 1, 'September 2025', '2025-09-01', '2025-09-30', 'א', 5786), +(2, 1, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), +(3, 1, 'November 2025', '2025-11-01', '2025-11-30', 'א', 5786), +(4, 1, 'December 2025', '2025-12-01', '2025-12-31', 'א', 5786), +(5, 2, 'September 2025', '2025-09-01', '2025-09-30', 'א', 5786), +(6, 2, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), +(9, 3, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), +(10, 3, 'November 2025', '2025-11-01', '2025-11-30', 'א', 5786); + +-- ============================================================ +-- Table: grade_names +-- Custom grade name mappings +-- ============================================================ +DROP TABLE IF EXISTS `grade_names`; +CREATE TABLE `grade_names` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `key` int NOT NULL, + `name` varchar(500) DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `grade_names_user_id_idx` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `grade_names` (`id`, `user_id`, `key`, `name`) VALUES +(1, 1, 100, 'Outstanding'), +(2, 1, 95, 'Excellent'), +(3, 1, 90, 'Very Good'), +(4, 1, 85, 'Good'), +(5, 1, 80, 'Above Average'), +(6, 2, 100, 'Perfect'), +(7, 2, 90, 'Great'), +(8, 2, 80, 'Good'), +(9, 1, 75, 'Satisfactory'), +(10, 3, 95, 'Excellent Work'); + +-- ============================================================ +-- Table: attendance_names +-- Custom attendance name mappings +-- ============================================================ +DROP TABLE IF EXISTS `attendance_names`; +CREATE TABLE `attendance_names` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `key` int NOT NULL, + `name` varchar(500) DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `attendance_names_user_id_idx` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `attendance_names` (`id`, `user_id`, `key`, `name`) VALUES +(1, 1, 1, 'Medical'), +(2, 1, 2, 'Family Event'), +(3, 1, 3, 'Religious Holiday'), +(4, 1, 4, 'School Activity'), +(5, 1, 5, 'Personal'), +(6, 2, 1, 'Sick'), +(7, 2, 2, 'Appointment'), +(8, 2, 3, 'Holiday'), +(9, 3, 1, 'Medical Leave'), +(10, 3, 2, 'Other'); + +-- ============================================================ +-- Table: report_groups +-- Report groups for batch reporting +-- ============================================================ +DROP TABLE IF EXISTS `report_groups`; +CREATE TABLE `report_groups` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `name` varchar(255) NOT NULL, + `topic` varchar(255) DEFAULT NULL, + `signatureData` longtext, + `teacherReferenceId` int DEFAULT NULL, + `lessonReferenceId` int DEFAULT NULL, + `klassReferenceId` int DEFAULT NULL, + `year` int DEFAULT NULL, + `isReverted` tinyint(1) NOT NULL DEFAULT '0', + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `report_groups_user_id_idx` (`user_id`), + KEY `report_groups_user_id_year_idx` (`user_id`, `year`), + KEY `report_groups_teacher_reference_id_idx` (`teacherReferenceId`), + KEY `report_groups_lesson_reference_id_idx` (`lessonReferenceId`), + KEY `report_groups_klass_reference_id_idx` (`klassReferenceId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `report_groups` (`id`, `user_id`, `name`, `topic`, `teacherReferenceId`, `lessonReferenceId`, `klassReferenceId`, `year`) VALUES +(1, 1, 'Math Class A - October', 'Algebra basics', 1, 1, 1, 5786), +(2, 1, 'Hebrew Class - October', 'Grammar and composition', 2, 2, 1, 5786), +(3, 1, 'English Class - October', 'Reading comprehension', 3, 3, 3, 5786), +(4, 2, 'Science Class - October', 'Biology fundamentals', 6, 6, 6, 5786), +(5, 2, 'CS Advanced - October', 'Programming basics', 7, 7, 10, 5786); + +-- ============================================================ +-- Table: report_group_sessions +-- Individual sessions within report groups +-- ============================================================ +DROP TABLE IF EXISTS `report_group_sessions`; +CREATE TABLE `report_group_sessions` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `reportGroupId` int NOT NULL, + `sessionDate` date NOT NULL, + `startTime` time DEFAULT NULL, + `endTime` time DEFAULT NULL, + `topic` varchar(255) DEFAULT NULL, + `isReverted` tinyint(1) NOT NULL DEFAULT '0', + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `report_group_sessions_user_id_idx` (`userId`), + KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), + KEY `report_group_sessions_session_date_idx` (`sessionDate`), + CONSTRAINT `FK_report_group_sessions_reportGroupId` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDate`, `startTime`, `endTime`, `topic`) VALUES +(1, 1, 1, '2025-10-01', '08:00:00', '09:30:00', 'Introduction to Algebra'), +(2, 1, 1, '2025-10-08', '08:00:00', '09:30:00', 'Linear equations'), +(3, 1, 2, '2025-10-02', '10:00:00', '11:30:00', 'Grammar review'), +(4, 1, 3, '2025-10-03', '13:00:00', '14:30:00', 'Reading strategies'), +(5, 2, 4, '2025-10-04', '09:00:00', '10:30:00', 'Cell structure'), +(6, 2, 5, '2025-10-05', '11:00:00', '12:30:00', 'Variables and data types'), +(7, 1, 1, '2025-10-15', '08:00:00', '09:30:00', 'Quadratic equations'), +(8, 1, 2, '2025-10-16', '10:00:00', '11:30:00', 'Essay writing'), +(9, 2, 4, '2025-10-18', '09:00:00', '10:30:00', 'Photosynthesis'), +(10, 2, 5, '2025-10-19', '11:00:00', '12:30:00', 'Control structures'); + +-- ============================================================ +-- Table: typeorm_metadata +-- TypeORM metadata for generated columns and other metadata +-- ============================================================ +DROP TABLE IF EXISTS `typeorm_metadata`; +CREATE TABLE `typeorm_metadata` ( + `type` varchar(255) NOT NULL, + `schema` varchar(255) DEFAULT NULL, + `table` varchar(255) DEFAULT NULL, + `name` varchar(255) DEFAULT NULL, + `value` text +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `typeorm_metadata` (`type`, `schema`, `table`, `name`, `value`) VALUES +('GENERATED_COLUMN', 'mysql_database', 'lessons', 'klass_reference_ids_json', 'CAST(CONCAT(''['', COALESCE(klassReferenceIds, ''''), '']'') AS JSON)'); + +SET FOREIGN_KEY_CHECKS = 1; + +-- ============================================================ +-- Views +-- Critical view entities required by the application +-- ============================================================ + +-- View: student_base_klass +CREATE OR REPLACE VIEW `student_base_klass` AS +SELECT + `student_klasses`.`studentReferenceId` AS `id`, + `student_klasses`.`user_id` AS `user_id`, + `student_klasses`.`year` AS `year`, + GROUP_CONCAT(DISTINCT IF(`klass_types`.`klassTypeEnum` = 'כיתת אם', `klasses`.`name`, NULL) SEPARATOR ', ') AS `base_klass` +FROM `student_klasses` +LEFT JOIN `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` +LEFT JOIN `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` +GROUP BY `studentReferenceId`, `user_id`, `year`; + +-- View: lesson_klass_name +CREATE OR REPLACE VIEW `lesson_klass_name` AS +SELECT lessons.id AS id, + lessons.user_id AS user_id, + GROUP_CONCAT(DISTINCT klasses.name SEPARATOR ', ') AS name +FROM lessons + LEFT JOIN JSON_TABLE( + lessons.klass_reference_ids_json, + "$[*]" COLUMNS(klass_id INT PATH "$") + ) AS jt ON 1 = 1 + LEFT JOIN klasses ON klasses.id = jt.klass_id +GROUP BY lessons.id, + lessons.user_id; + + +-- ============================================================ +-- Table: texts +-- Text content management +-- ============================================================ +DROP TABLE IF EXISTS `texts`; +CREATE TABLE `texts` ( + `id` int UNSIGNED NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `name` varchar(100) NOT NULL, + `description` varchar(500) NOT NULL, + `value` varchar(10000) NOT NULL, + `filepath` varchar(255) DEFAULT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `texts_users_idx` (`user_id`), + KEY `texts_name_idx` (`name`), + KEY `texts_user_id_name_idx` (`user_id`, `name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `texts` (`id`, `user_id`, `name`, `description`, `value`) VALUES +(1, 1, 'welcome_message', 'Welcome message for homepage', 'Welcome to our school management system'), +(2, 1, 'footer_text', 'Footer copyright text', '© 5786 School Management System'), +(3, 2, 'announcement', 'School announcement', 'Important: School will be closed on holidays'); + +-- ============================================================ +-- Table: audit_log +-- Audit log for tracking changes +-- ============================================================ +DROP TABLE IF EXISTS `audit_log`; +CREATE TABLE `audit_log` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `entityId` int NOT NULL, + `entityName` varchar(255) NOT NULL, + `operation` varchar(255) NOT NULL, + `entityData` text NOT NULL, + `isReverted` tinyint(1) NOT NULL DEFAULT '0', + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `audit_log` (`id`, `userId`, `entityId`, `entityName`, `operation`, `entityData`) VALUES +(1, 1, 1, 'Student', 'CREATE', '{"name": "Avigail Abramson", "tz": "111111111"}'), +(2, 1, 1, 'Teacher', 'UPDATE', '{"id": 1, "phone": "0501111111"}'); + +-- ============================================================ +-- Table: yemot_call +-- Phone system call tracking +-- ============================================================ +DROP TABLE IF EXISTS `yemot_call`; +CREATE TABLE `yemot_call` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `apiCallId` varchar(255) NOT NULL, + `phone` varchar(255) NOT NULL, + `history` mediumtext NOT NULL, + `currentStep` varchar(255) NOT NULL, + `data` text DEFAULT NULL, + `isOpen` tinyint NOT NULL, + `hasError` tinyint NOT NULL DEFAULT 0, + `errorMessage` varchar(255) DEFAULT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `yemot_call_api_call_id_idx` (`apiCallId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: mail_address +-- Email address management +-- ============================================================ +DROP TABLE IF EXISTS `mail_address`; +CREATE TABLE `mail_address` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `alias` varchar(255) NOT NULL, + `entity` varchar(255) NOT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_mail_address_userId_entity` (`userId`, `entity`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: recieved_mail +-- Received email tracking +-- ============================================================ +DROP TABLE IF EXISTS `recieved_mail`; +CREATE TABLE `recieved_mail` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `mailData` text NOT NULL, + `from` varchar(255) NOT NULL, + `to` varchar(255) NOT NULL, + `subject` text DEFAULT NULL, + `body` text DEFAULT NULL, + `entityName` varchar(255) NOT NULL, + `importFileIds` text NOT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: page +-- CMS pages +-- ============================================================ +DROP TABLE IF EXISTS `page`; +CREATE TABLE `page` ( + `id` int NOT NULL AUTO_INCREMENT, + `description` varchar(255) NOT NULL, + `value` longtext NOT NULL, + `order` int DEFAULT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: image +-- Image storage +-- ============================================================ +DROP TABLE IF EXISTS `image`; +CREATE TABLE `image` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `fileDataSrc` mediumtext NOT NULL, + `fileDataTitle` text NOT NULL, + `imageTarget` varchar(255) NOT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `IDX_image_userId_imageTarget` (`userId`, `imageTarget`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: payment_track +-- Payment tracking information +-- ============================================================ +DROP TABLE IF EXISTS `payment_track`; +CREATE TABLE `payment_track` ( + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `description` longtext NOT NULL, + `monthlyPrice` int NOT NULL, + `annualPrice` int NOT NULL, + `studentNumberLimit` int NOT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `payment_track` (`id`, `name`, `description`, `monthlyPrice`, `annualPrice`, `studentNumberLimit`) VALUES +(1, 'Basic Plan', 'Basic features', 100, 1000, 50), +(2, 'Standard Plan', 'Standard features', 200, 2000, 150), +(3, 'Premium Plan', 'All features', 300, 3000, 500); + +-- ============================================================ +-- Table: import_file +-- File import tracking +-- ============================================================ +DROP TABLE IF EXISTS `import_file`; +CREATE TABLE `import_file` ( + `id` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `fileName` varchar(255) NOT NULL, + `fileSource` varchar(255) NOT NULL, + `entityIds` text NOT NULL, + `entityName` varchar(255) NOT NULL, + `fullSuccess` tinyint(1) DEFAULT NULL, + `response` varchar(255) DEFAULT NULL, + `metadata` json DEFAULT NULL, + `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- ============================================================ +-- Table: att_grade_effect +-- Attendance and grade effect tracking +-- ============================================================ +DROP TABLE IF EXISTS `att_grade_effect`; +CREATE TABLE `att_grade_effect` ( + `id` int NOT NULL AUTO_INCREMENT, + `user_id` int NOT NULL, + `percents` int DEFAULT NULL, + `count` int DEFAULT NULL, + `effect` int NOT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `att_grade_effect_user_id_idx` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `att_grade_effect` (`user_id`, `percents`, `count`, `effect`) VALUES +(1, 90, 2, 5), +(1, 80, 3, 0), +(1, 70, 4, -5); + +-- ============================================================ +-- Helper Table: numbers (Required for View logic) +-- ============================================================ + +DROP TABLE IF EXISTS `numbers`; +CREATE TABLE `numbers` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `number` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `numbers` (`id`, `number`) VALUES +(1, '1'),(2, '2'),(3, '3'),(4, '4'),(5, '5'),(6, '6'),(7, '7'),(8, '8'),(9, '9'),(10, '10'), +(11, '11'),(12, '12'),(13, '13'),(14, '14'),(15, '15'),(16, '16'),(17, '17'),(18, '18'),(19, '19'),(20, '20'), +(21, '21'),(22, '22'),(23, '23'),(24, '24'),(25, '25'),(26, '26'),(27, '27'),(28, '28'),(29, '29'),(30, '30'), +(31, '31'),(32, '32'),(33, '33'),(34, '34'),(35, '35'),(36, '36'),(37, '37'),(38, '38'),(39, '39'),(40, '40'), +(41, '41'),(42, '42'),(43, '43'),(44, '44'),(45, '45'),(46, '46'),(47, '47'),(48, '48'),(49, '49'),(50, '50'), +(51, '51'),(52, '52'),(53, '53'),(54, '54'),(55, '55'),(56, '56'),(57, '57'),(58, '58'),(59, '59'),(60, '60'), +(61, '61'),(62, '62'),(63, '63'),(64, '64'),(65, '65'),(66, '66'),(67, '67'),(68, '68'),(69, '69'),(70, '70'), +(71, '71'),(72, '72'),(73, '73'),(74, '74'),(75, '75'),(76, '76'),(77, '77'),(78, '78'),(79, '79'),(80, '80'), +(81, '81'),(82, '82'),(83, '83'),(84, '84'),(85, '85'),(86, '86'),(87, '87'),(88, '88'),(89, '89'),(90, '90'), +(91, '91'),(92, '92'),(93, '93'),(94, '94'),(95, '95'),(96, '96'),(97, '97'),(98, '98'),(99, '99'),(100, '100'), +(101, '0'); + +-- ============================================================ +-- Additional Views - All TypeORM View Entities +-- ============================================================ + +-- View: att_report_and_grade +CREATE OR REPLACE VIEW `att_report_and_grade` AS +SELECT + CONCAT('a-', id) AS id, + 'att' as `type`, + user_id, + `year`, + studentReferenceId, + teacherReferenceId, + lessonReferenceId, + klassReferenceId, + report_date, + how_many_lessons, + abs_count, + approved_abs_count, + NULL AS grade, + NULL AS estimation, + comments, + sheet_name +FROM att_reports +UNION +SELECT + CONCAT('g-', id) AS id, + 'grade' as `type`, + user_id, + `year`, + studentReferenceId, + teacherReferenceId, + lessonReferenceId, + klassReferenceId, + report_date, + how_many_lessons, + NULL AS abs_count, + NULL AS approved_abs_count, + grade, + estimation, + comments, + NULL AS sheet_name +FROM grades; + +-- View: student_global_report +CREATE OR REPLACE VIEW `student_global_report` AS +SELECT `atag`.`year` AS `year`, + `atag`.`teacherReferenceId` AS `teacherReferenceId`, + CONCAT( + COALESCE(studentReferenceId, "null"), + "_", + COALESCE(`atag`.`teacherReferenceId`, "null"), + "_", + COALESCE(klassReferenceId, "null"), + "_", + COALESCE(lessonReferenceId, "null"), + "_", + COALESCE(`atag`.`user_id`, "null"), + "_", + COALESCE(`atag`.`year`, "null") + ) AS `id`, + `atag`.`user_id` AS `user_id`, + studentReferenceId, + klassReferenceId, + lessonReferenceId, + CASE + WHEN `klass_types`.`klassTypeEnum` = "כיתת אם" THEN 1 + ELSE 0 + END AS `isBaseKlass`, + SUM(how_many_lessons) AS `lessons_count`, + SUM(abs_count) AS `abs_count`, + AVG(grade) AS `grade_avg` +FROM `att_report_and_grade` `atag` + LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `atag`.`klassReferenceId` + LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` +GROUP BY studentReferenceId, + `atag`.`teacherReferenceId`, + klassReferenceId, + lessonReferenceId, + `atag`.`user_id`, + `atag`.`year`; + +-- View: student_speciality +CREATE OR REPLACE VIEW `student_speciality` AS +SELECT + student_klasses.studentReferenceId AS id, + student_klasses.user_id, + student_klasses.year, + GROUP_CONCAT(DISTINCT IF(klass_types.klassTypeEnum = 'התמחות', klasses.name, NULL) SEPARATOR ', ') AS base_klass +FROM student_klasses +LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId +LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId +GROUP BY studentReferenceId, user_id, year; + +-- View: student_by_year +CREATE OR REPLACE VIEW `student_by_year` AS +SELECT + students.id, + students.user_id, + students.tz, + students.name, + students.is_active AS isActive, + GROUP_CONCAT(DISTINCT student_klasses.year) AS year, + GROUP_CONCAT(DISTINCT student_klasses.klassReferenceId) AS klassReferenceIds, + GROUP_CONCAT(DISTINCT klasses.klassTypeReferenceId) AS klassTypeReferenceIds +FROM student_klasses +LEFT JOIN students ON students.id = student_klasses.studentReferenceId +LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId +GROUP BY students.id; + +-- View: student_klasses_report +CREATE OR REPLACE VIEW student_klasses_report AS +SELECT student_klasses.year AS year, + students.id AS id, + students.id AS student_reference_id, + students.tz AS student_tz, + students.name AS student_name, + student_klasses.user_id AS user_id, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'כיתת אם', + student_klasses.klassReferenceId, + NULL + ) SEPARATOR ',' + ) AS klassReferenceId_1, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'מסלול', + student_klasses.klassReferenceId, + NULL + ) SEPARATOR ',' + ) AS klassReferenceId_2, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'התמחות', + student_klasses.klassReferenceId, + NULL + ) SEPARATOR ',' + ) AS klassReferenceId_3, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, + student_klasses.klassReferenceId, + NULL + ) SEPARATOR ',' + ) AS klassReferenceId_null, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'כיתת אם', + klasses.name, + NULL + ) SEPARATOR ', ' + ) AS klass_name_1, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'מסלול', + klasses.name, + NULL + ) SEPARATOR ', ' + ) AS klass_name_2, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'התמחות', + klasses.name, + NULL + ) SEPARATOR ', ' + ) AS klass_name_3, + GROUP_CONCAT( + IF( + klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, + klasses.name, + NULL + ) SEPARATOR ', ' + ) AS klass_name_null +FROM student_klasses + LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId + LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId + LEFT JOIN students ON students.id = student_klasses.studentReferenceId +GROUP BY students.id, + student_klasses.user_id, + student_klasses.year; + +-- View: student_percent_report +CREATE OR REPLACE VIEW `student_percent_report` AS +SELECT id, + user_id, + year, + studentReferenceId, + teacherReferenceId, + klassReferenceId, + lessonReferenceId, + lessons_count, + abs_count, + COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) AS `abs_percents`, + ( + 1 - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) + ) AS `att_percents`, + grade_avg / 100 AS `grade_avg` +FROM `student_global_report` `sgr`; + +-- View: text_by_user +CREATE OR REPLACE VIEW `text_by_user` AS +SELECT `t_base`.`name` AS `name`, + `t_base`.`description` AS `description`, + `users`.`id` AS `userId`, + `t_user`.`id` AS `overrideTextId`, + CONCAT(`users`.`id`, "_", `t_base`.`id`) AS `id`, + COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, + COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` +FROM `texts` `t_base` + LEFT JOIN `users` `users` ON `users`.`effective_id` is null + LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` + AND `t_user`.`user_id` = `users`.`id` +WHERE `t_base`.`user_id` = 0 +ORDER BY `users`.`id` ASC, + `t_base`.`id` ASC; + +-- View: att_report_with_report_month +CREATE OR REPLACE VIEW att_report_with_report_month AS +SELECT report_months.id AS reportMonthReferenceId, + att_reports.* +FROM att_reports + LEFT JOIN report_month report_months ON att_reports.user_id = report_months.userId + AND att_reports.report_date <= report_months.endDate + AND att_reports.report_date >= report_months.startDate; + +-- View: grade_with_report_month +CREATE OR REPLACE VIEW `grade_with_report_month` AS +SELECT `report_months`.`id` AS `reportMonthReferenceId`, + grades.* +FROM `grades` `grades` + LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` + AND `grades`.`report_date` <= `report_months`.`endDate` + AND `grades`.`report_date` >= `report_months`.`startDate`; + +-- View: known_absence_with_report_month +CREATE OR REPLACE VIEW known_absence_with_report_month AS +SELECT report_months.id AS reportMonthReferenceId, + known_absences.* +FROM known_absences + LEFT JOIN report_month report_months ON known_absences.user_id = report_months.userId + AND known_absences.report_date <= report_months.endDate + AND known_absences.report_date >= report_months.startDate; + +-- View: grade_effect_by_user +CREATE OR REPLACE VIEW `grade_effect_by_user` AS +SELECT `users`.`id` AS `userId`, + CONCAT(`users`.`id`, "_", numbers.number) AS `id`, + numbers.number AS `number`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE + WHEN `att_grade_effect`.`percents` <= numbers.number THEN CONCAT( + LPAD(`att_grade_effect`.`percents`, 10, '0'), + '|', + `att_grade_effect`.`effect` + ) + ELSE NULL + END + ), + '|', + -1 + ), + '0' + ) AS SIGNED + ) + 0 AS `effect` +FROM `numbers` `numbers` + LEFT JOIN `users` `users` ON 1 = 1 + LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` +GROUP BY `users`.`id`, + numbers.number +ORDER BY `users`.`id` ASC, + numbers.number ASC; + +-- View: abs_count_effect_by_user +CREATE OR REPLACE VIEW `abs_count_effect_by_user` AS +SELECT `users`.`id` AS `userId`, + CONCAT(`users`.`id`, "_", numbers.number) AS `id`, + numbers.number AS `number`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE + WHEN `att_grade_effect`.`count` <= numbers.number THEN CONCAT( + LPAD(`att_grade_effect`.`count`, 10, '0'), + '|', + `att_grade_effect`.`effect` + ) + ELSE NULL + END + ), + '|', + -1 + ), + '0' + ) AS SIGNED + ) + 0 AS `effect` +FROM `numbers` `numbers` + LEFT JOIN `users` `users` ON 1 = 1 + LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` +GROUP BY `users`.`id`, + numbers.number +ORDER BY `users`.`id` ASC, + numbers.number ASC; + +-- View: teacher_lesson_report_status +CREATE OR REPLACE VIEW `teacher_lesson_report_status` AS +SELECT `teachers`.`id` AS `teacherId`, + `lessons`.`id` AS `lessonId`, + `lessons`.`year` AS `year`, + `lessons`.`name` AS `lessonName`, + `report_months`.`id` AS `reportMonthId`, + `teachers`.`user_id` AS `userId`, + CASE + WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 + ELSE 0 + END AS `isReported` +FROM `teachers` `teachers` + INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` + LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` + AND `report_months`.`year` = `lessons`.`year` + LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` + AND `att_reports`.`lessonReferenceId` = `lessons`.`id` + AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` +WHERE COALESCE( + `lessons`.`start_date`, + `report_months`.`endDate` + ) <= `report_months`.`endDate` + AND COALESCE( + `lessons`.`end_date`, + `report_months`.`startDate` + ) >= `report_months`.`startDate` +GROUP BY `teachers`.`id`, + `lessons`.`id`, + `report_months`.`id` +ORDER BY `report_months`.`id` ASC; + +-- View: teacher_report_status +CREATE OR REPLACE VIEW teacher_report_status AS +SELECT + CONCAT(COALESCE(tlrs.userId, 'null'), '_', COALESCE(tlrs.teacherId, 'null'), '_', + COALESCE(tlrs.reportMonthId, 'null'), '_', COALESCE(tlrs.year, 'null')) AS id, + tlrs.userId, + tlrs.teacherId, + t.name AS teacherName, + t.comment AS teacherComment, + tlrs.reportMonthId, + tlrs.year, + rm.name AS reportMonthName, + GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS reportedLessons, + GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS notReportedLessons, + GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS reportedLessonNames, + GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS notReportedLessonNames +FROM teacher_lesson_report_status tlrs +LEFT JOIN teachers t ON tlrs.teacherId = t.id +LEFT JOIN report_month rm ON tlrs.reportMonthId = rm.id +GROUP BY tlrs.userId, tlrs.teacherId, tlrs.reportMonthId, tlrs.year +ORDER BY tlrs.reportMonthId, tlrs.teacherId; + +-- View: teacher_lesson_grade_report_status +CREATE OR REPLACE VIEW `teacher_lesson_grade_report_status` AS +SELECT `teachers`.`id` AS `teacherId`, + `lessons`.`id` AS `lessonId`, + `lessons`.`year` AS `year`, + `lessons`.`name` AS `lessonName`, + `report_months`.`id` AS `reportMonthId`, + `teachers`.`user_id` AS `userId`, + CASE + WHEN COUNT(`grades`.`id`) > 0 THEN 1 + ELSE 0 + END AS `isReported` +FROM `teachers` `teachers` + INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` + LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` + LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` + AND `grades`.`lessonReferenceId` = `lessons`.`id` + AND `grades`.`reportMonthReferenceId` = `report_months`.`id` +WHERE COALESCE( + `lessons`.`start_date`, + `report_months`.`endDate` + ) <= `report_months`.`endDate` + AND COALESCE( + `lessons`.`end_date`, + `report_months`.`startDate` + ) >= `report_months`.`startDate` +GROUP BY `teachers`.`id`, + `lessons`.`id`, + `report_months`.`id` +ORDER BY `report_months`.`id` ASC; + +-- View: teacher_grade_report_status +CREATE OR REPLACE VIEW teacher_grade_report_status AS +SELECT + CONCAT(COALESCE(tlgrs.userId, 'null'), '_', COALESCE(tlgrs.teacherId, 'null'), '_', + COALESCE(tlgrs.reportMonthId, 'null'), '_', COALESCE(tlgrs.year, 'null')) AS id, + tlgrs.userId, + tlgrs.teacherId, + t.name AS teacherName, + t.comment AS teacherComment, + tlgrs.reportMonthId, + tlgrs.year, + rm.name AS reportMonthName, + GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS reportedLessons, + GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS notReportedLessons, + GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS reportedLessonNames, + GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS notReportedLessonNames +FROM teacher_lesson_grade_report_status tlgrs +LEFT JOIN teachers t ON tlgrs.teacherId = t.id +LEFT JOIN report_month rm ON tlgrs.reportMonthId = rm.id +GROUP BY tlgrs.userId, tlgrs.teacherId, tlgrs.reportMonthId, tlgrs.year +ORDER BY tlgrs.reportMonthId, tlgrs.teacherId; + +-- View: teacher_salary_report +CREATE OR REPLACE VIEW `teacher_salary_report` AS +SELECT DISTINCT `att_reports`.`year` AS `year`, + `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, + `att_reports`.`klassReferenceId` AS `klassReferenceId`, + `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, + `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, + CONCAT( + COALESCE(`att_reports`.`user_id`, "null"), + "_", + COALESCE(`att_reports`.`teacherReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`lessonReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`klassReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`how_many_lessons`, "null"), + "_", + COALESCE(`att_reports`.`year`, "null"), + "_", + COALESCE(`att_reports`.`reportMonthReferenceId`, "null") + ) AS `id`, + `att_reports`.`user_id` AS `userId`, + `att_reports`.`how_many_lessons` AS `how_many_lessons` +FROM `att_report_with_report_month` `att_reports`; From aa4641f8b4d4770fbb91a7bdf0802c67d7e9a911 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 13:33:00 +0000 Subject: [PATCH 04/10] Fix timestamp columns to use datetime(6) format matching TypeORM expectations Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 92 ++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/db/data.sql b/db/data.sql index 7f435384..e9caee98 100644 --- a/db/data.sql +++ b/db/data.sql @@ -160,8 +160,8 @@ CREATE TABLE `users` ( `password` varchar(500) DEFAULT NULL, `phone_number` varchar(11) DEFAULT NULL, `active` tinyint DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), `effective_id` int DEFAULT NULL, `permissions` json DEFAULT NULL, `additionalData` json DEFAULT NULL, @@ -200,8 +200,8 @@ CREATE TABLE `teachers` ( `email` varchar(500) DEFAULT NULL, `comment` varchar(1000) DEFAULT NULL, `displayName` varchar(500) DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_teachers_user_tz_year` (`user_id`, `tz`, `year`), KEY `teachers_users_idx` (`user_id`), @@ -236,8 +236,8 @@ CREATE TABLE `students` ( `phone` varchar(1000) DEFAULT NULL, `address` varchar(1000) DEFAULT NULL, `is_active` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_students_user_tz_year` (`user_id`, `tz`, `year`), KEY `students_users_idx` (`user_id`) @@ -273,8 +273,8 @@ CREATE TABLE `klass_types` ( `klassTypeEnum` varchar(255) NOT NULL DEFAULT 'אחר', `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `klass_types_users_idx` (`user_id`), KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) @@ -308,8 +308,8 @@ CREATE TABLE `klasses` ( `klassTypeReferenceId` int DEFAULT NULL, `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_klasses_user_key_year` (`user_id`, `key`, `year`), KEY `klasses_users_idx` (`user_id`), @@ -352,8 +352,8 @@ CREATE TABLE `lessons` ( `comment` varchar(1000) DEFAULT NULL, `how_many_lessons` float DEFAULT NULL, `order` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_lessons_user_key_year` (`user_id`, `key`, `year`), KEY `lessons_users_idx` (`user_id`), @@ -386,8 +386,8 @@ CREATE TABLE `student_klasses` ( `studentReferenceId` int DEFAULT NULL, `klass_id` int DEFAULT NULL, `klassReferenceId` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `student_klasses_users_idx` (`user_id`), KEY `student_klasses_user_year_idx` (`user_id`, `year`), @@ -438,8 +438,8 @@ CREATE TABLE `att_reports` ( `comments` varchar(500) DEFAULT NULL, `sheet_name` varchar(100) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `att_users_idx` (`user_id`), KEY `att_user_sheet_name_lession_klass_year_idx` (`user_id`, `sheet_name`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -495,8 +495,8 @@ CREATE TABLE `grades` ( `estimation` varchar(500) DEFAULT NULL, `comments` varchar(500) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `grades_users_idx` (`user_id`), KEY `grades_user_lesson_klass_year_idx` (`user_id`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -547,8 +547,8 @@ CREATE TABLE `known_absences` ( `reason` varchar(500) DEFAULT NULL, `comment` varchar(500) DEFAULT NULL, `isApproved` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `known_users_idx` (`user_id`), KEY `IDX_known_absences_studentReferenceId_year` (`studentReferenceId`, `year`), @@ -581,8 +581,8 @@ CREATE TABLE `report_month` ( `semester` varchar(255) NOT NULL DEFAULT 'שנתי', `year` int DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `report_month_user_id_idx` (`userId`), KEY `report_month_user_id_start_date_end_date_idx` (`userId`, `startDate`, `endDate`), @@ -612,8 +612,8 @@ CREATE TABLE `grade_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `grade_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -640,8 +640,8 @@ CREATE TABLE `attendance_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `attendance_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -673,8 +673,8 @@ CREATE TABLE `report_groups` ( `lessonReferenceId` int DEFAULT NULL, `klassReferenceId` int DEFAULT NULL, `year` int DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `report_groups_user_id_idx` (`user_id`), KEY `report_groups_user_id_year_idx` (`user_id`, `year`), @@ -703,7 +703,7 @@ CREATE TABLE `report_group_sessions` ( `startTime` time DEFAULT NULL, `endTime` time DEFAULT NULL, `topic` varchar(255) DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `report_group_sessions_user_id_idx` (`userId`), KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), @@ -785,8 +785,8 @@ CREATE TABLE `texts` ( `description` varchar(500) NOT NULL, `value` varchar(10000) NOT NULL, `filepath` varchar(255) DEFAULT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `texts_users_idx` (`user_id`), KEY `texts_name_idx` (`name`), @@ -811,7 +811,7 @@ CREATE TABLE `audit_log` ( `operation` varchar(255) NOT NULL, `entityData` text NOT NULL, `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -835,8 +835,8 @@ CREATE TABLE `yemot_call` ( `isOpen` tinyint NOT NULL, `hasError` tinyint NOT NULL DEFAULT 0, `errorMessage` varchar(255) DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `yemot_call_api_call_id_idx` (`apiCallId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -851,8 +851,8 @@ CREATE TABLE `mail_address` ( `userId` int NOT NULL, `alias` varchar(255) NOT NULL, `entity` varchar(255) NOT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_mail_address_userId_entity` (`userId`, `entity`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -872,7 +872,7 @@ CREATE TABLE `recieved_mail` ( `body` text DEFAULT NULL, `entityName` varchar(255) NOT NULL, `importFileIds` text NOT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -886,8 +886,8 @@ CREATE TABLE `page` ( `description` varchar(255) NOT NULL, `value` longtext NOT NULL, `order` int DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -902,8 +902,8 @@ CREATE TABLE `image` ( `fileDataSrc` mediumtext NOT NULL, `fileDataTitle` text NOT NULL, `imageTarget` varchar(255) NOT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_image_userId_imageTarget` (`userId`, `imageTarget`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -920,8 +920,8 @@ CREATE TABLE `payment_track` ( `monthlyPrice` int NOT NULL, `annualPrice` int NOT NULL, `studentNumberLimit` int NOT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -945,7 +945,7 @@ CREATE TABLE `import_file` ( `fullSuccess` tinyint(1) DEFAULT NULL, `response` varchar(255) DEFAULT NULL, `metadata` json DEFAULT NULL, - `createdAt` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -960,8 +960,8 @@ CREATE TABLE `att_grade_effect` ( `percents` int DEFAULT NULL, `count` int DEFAULT NULL, `effect` int NOT NULL, - `created_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `att_grade_effect_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; From c2975d289f1053eb36e255fee698b3c32e5fe111 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 14:44:23 +0000 Subject: [PATCH 05/10] Major schema updates: timestamp types, tinyint format, index names, remove backup file Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 74 +-- db/data.sql.backup | 1441 -------------------------------------------- 2 files changed, 37 insertions(+), 1478 deletions(-) delete mode 100644 db/data.sql.backup diff --git a/db/data.sql b/db/data.sql index e9caee98..106240cb 100644 --- a/db/data.sql +++ b/db/data.sql @@ -166,7 +166,7 @@ CREATE TABLE `users` ( `permissions` json DEFAULT NULL, `additionalData` json DEFAULT NULL, `userInfo` json DEFAULT NULL, - `isPaid` tinyint(1) NOT NULL DEFAULT '0', + `isPaid` tinyint NOT NULL DEFAULT 0, `paymentMethod` varchar(255) DEFAULT NULL, `mailAddressAlias` varchar(255) DEFAULT NULL, `mailAddressTitle` varchar(255) DEFAULT NULL, @@ -200,10 +200,10 @@ CREATE TABLE `teachers` ( `email` varchar(500) DEFAULT NULL, `comment` varchar(1000) DEFAULT NULL, `displayName` varchar(500) DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_teachers_user_tz_year` (`user_id`, `tz`, `year`), + UNIQUE KEY `IDX_284ec0d1b23c78061dd15e5be1` (`user_id`, `tz`, `year`), KEY `teachers_users_idx` (`user_id`), KEY `teachers_user_id_phone_idx` (`user_id`, `phone`), KEY `teachers_user_id_phone2_idx` (`user_id`, `phone2`) @@ -235,11 +235,11 @@ CREATE TABLE `students` ( `comment` varchar(1000) DEFAULT NULL, `phone` varchar(1000) DEFAULT NULL, `address` varchar(1000) DEFAULT NULL, - `is_active` tinyint(1) NOT NULL DEFAULT '1', - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `is_active` tinyint NOT NULL DEFAULT 1, + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_students_user_tz_year` (`user_id`, `tz`, `year`), + UNIQUE KEY `IDX_53f436b35b00a4bcb00bfa08ce` (`user_id`, `tz`, `year`), KEY `students_users_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -273,8 +273,8 @@ CREATE TABLE `klass_types` ( `klassTypeEnum` varchar(255) NOT NULL DEFAULT 'אחר', `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `klass_types_users_idx` (`user_id`), KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) @@ -308,10 +308,10 @@ CREATE TABLE `klasses` ( `klassTypeReferenceId` int DEFAULT NULL, `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_klasses_user_key_year` (`user_id`, `key`, `year`), + UNIQUE KEY `IDX_b79f5a3d6f4c83df7d03fcf1a3` (`user_id`, `key`, `year`), KEY `klasses_users_idx` (`user_id`), KEY `klasses_user_id_key_idx` (`user_id`, `key`), KEY `klasses_klass_type_reference_id_idx` (`klassTypeReferenceId`), @@ -352,10 +352,10 @@ CREATE TABLE `lessons` ( `comment` varchar(1000) DEFAULT NULL, `how_many_lessons` float DEFAULT NULL, `order` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_lessons_user_key_year` (`user_id`, `key`, `year`), + UNIQUE KEY `IDX_95dda12bd0a76cf4a439da99fe` (`user_id`, `key`, `year`), KEY `lessons_users_idx` (`user_id`), KEY `lessons_user_id_key_idx` (`user_id`, `key`), KEY `lessons_teacher_reference_id_idx` (`teacherReferenceId`) @@ -386,15 +386,15 @@ CREATE TABLE `student_klasses` ( `studentReferenceId` int DEFAULT NULL, `klass_id` int DEFAULT NULL, `klassReferenceId` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `student_klasses_users_idx` (`user_id`), KEY `student_klasses_user_year_idx` (`user_id`, `year`), KEY `student_klasses_student_reference_id_year_idx` (`studentReferenceId`, `year`), KEY `student_klasses_user_klass_year_idx` (`user_id`, `klassReferenceId`, `year`), KEY `student_klasses_user_student_klass_year_idx` (`user_id`, `studentReferenceId`, `klassReferenceId`, `year`), - KEY `IDX_student_klasses_studentReferenceId_year` (`studentReferenceId`, `year`) + KEY `IDX_a7a9761c4d14939ffa38598ee8` (`studentReferenceId`, `year`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `student_klasses` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`) VALUES @@ -438,8 +438,8 @@ CREATE TABLE `att_reports` ( `comments` varchar(500) DEFAULT NULL, `sheet_name` varchar(100) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `att_users_idx` (`user_id`), KEY `att_user_sheet_name_lession_klass_year_idx` (`user_id`, `sheet_name`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -495,8 +495,8 @@ CREATE TABLE `grades` ( `estimation` varchar(500) DEFAULT NULL, `comments` varchar(500) DEFAULT NULL, `reportGroupSessionId` int DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `grades_users_idx` (`user_id`), KEY `grades_user_lesson_klass_year_idx` (`user_id`, `lessonReferenceId`, `klassReferenceId`, `year`), @@ -546,12 +546,12 @@ CREATE TABLE `known_absences` ( `sender_name` varchar(100) DEFAULT NULL, `reason` varchar(500) DEFAULT NULL, `comment` varchar(500) DEFAULT NULL, - `isApproved` tinyint(1) NOT NULL DEFAULT '1', - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `isApproved` tinyint NOT NULL DEFAULT 1, + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `known_users_idx` (`user_id`), - KEY `IDX_known_absences_studentReferenceId_year` (`studentReferenceId`, `year`), + KEY `IDX_f2e0b7295d97b24618d46079c1` (`studentReferenceId`, `year`), KEY `known_absences_student_reference_id_idx` (`studentReferenceId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -612,8 +612,8 @@ CREATE TABLE `grade_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `grade_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -640,8 +640,8 @@ CREATE TABLE `attendance_names` ( `user_id` int NOT NULL, `key` int NOT NULL, `name` varchar(500) DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `attendance_names_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -810,7 +810,7 @@ CREATE TABLE `audit_log` ( `entityName` varchar(255) NOT NULL, `operation` varchar(255) NOT NULL, `entityData` text NOT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', + `isReverted` tinyint NOT NULL DEFAULT 0, `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -854,7 +854,7 @@ CREATE TABLE `mail_address` ( `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_mail_address_userId_entity` (`userId`, `entity`) + UNIQUE KEY `IDX_10d2242b0e45f6add0b4269cbf` (`userId`, `entity`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- ============================================================ @@ -905,7 +905,7 @@ CREATE TABLE `image` ( `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - UNIQUE KEY `IDX_image_userId_imageTarget` (`userId`, `imageTarget`) + UNIQUE KEY `IDX_35596848f8bb8f7b5ec5fcf9e0` (`userId`, `imageTarget`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- ============================================================ @@ -943,7 +943,7 @@ CREATE TABLE `import_file` ( `entityIds` text NOT NULL, `entityName` varchar(255) NOT NULL, `fullSuccess` tinyint(1) DEFAULT NULL, - `response` varchar(255) DEFAULT NULL, + `response` varchar(255) NOT NULL, `metadata` json DEFAULT NULL, `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`) @@ -960,8 +960,8 @@ CREATE TABLE `att_grade_effect` ( `percents` int DEFAULT NULL, `count` int DEFAULT NULL, `effect` int NOT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `att_grade_effect_user_id_idx` (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/db/data.sql.backup b/db/data.sql.backup deleted file mode 100644 index a7f6feb9..00000000 --- a/db/data.sql.backup +++ /dev/null @@ -1,1441 +0,0 @@ --- MySQL Database Initialization Script --- Generated for react-admin-nestjs project --- This script creates all tables and populates them with sample data - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ============================================================ --- Table: migrations --- Stores migration history --- ============================================================ -DROP TABLE IF EXISTS `migrations`; -CREATE TABLE `migrations` ( - `id` int NOT NULL AUTO_INCREMENT, - `timestamp` bigint NOT NULL, - `name` varchar(255) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `migrations` (`timestamp`, `name`) VALUES -(1675356165986, 'KlassAddReferenceId1675356165986'), -(1675366584689, 'KlassAddKlassTypeReferenceId1675366584689'), -(1676234639701, 'addManyReferenceId1676234639701'), -(1676319747789, 'addAuditLog1676319747789'), -(1676373585567, 'updateStudentBaseKlass1676373585567'), -(1676973723497, 'addImportFileTable1676973723497'), -(1679387546635, 'fixLessonReferenceId1679387546635'), -(1679433140359, 'addMailAddressTable1679433140359'), -(1679606124656, 'addHandleEmailData1679606124656'), -(1679607283312, 'updateHandleEmailData1679607283312'), -(1681588431337, 'recievedMailNullableColumns1681588431337'), -(1682255853138, 'addUserInfoColumn1682255853138'), -(1682613070027, 'fixKlassType1682613070027'), -(1682885643767, 'updateNullableFields1682885643767'), -(1682967271092, 'updateDateFields1682967271092'), -(1682968919553, 'addPageTable1682968919553'), -(1683142771777, 'removePathAddOrderPagesTable1683142771777'), -(1683527164577, 'rerunReferenceIdForProd1683527164577'), -(1684139644957, 'addReportMonthsTable1684139644957'), -(1684164901088, 'createTeacherReportStatusViews1684164901088'), -(1684165648031, 'addIdToTeacherReportStatusView1684165648031'), -(1684165883070, 'updateIdToTeacherReportStatusView1684165883070'), -(1684219765661, 'addJoinsToTeacherReportStatus1684219765661'), -(1684223659058, 'addKlassReferenceIdForLessons1684223659058'), -(1684406609710, 'updateStudentKlassReeportReference1684406609710'), -(1684407026417, 'updateStudentKlassReeportJoinStudents1684407026417'), -(1684693416581, 'addUserPaymentInfo1684693416581'), -(1684694518104, 'addUserSendMailFromInfo1684694518104'), -(1684842208464, 'addTextByUserView1684842208464'), -(1684852538625, 'addUserIdToTextByUserView1684852538625'), -(1686680413320, 'updateStudentBaseKlassReportJoinConditions1686680413320'), -(1686757018415, 'addAttReportAndGradeView1686757018415'), -(1686757929196, 'addStudentGlobalReportView1686757929196'), -(1686758604957, 'fixStudentGlobalReportView1686758604957'), -(1686766165368, 'addStudentPercentReportView1686766165368'), -(1686766691647, 'changeStudentPercentReportViewUpdatePercentCalc1686766691647'), -(1686766743345, 'changeStudentPercentReportViewUpdateGradeCalc1686766743345'), -(1687115195304, 'addYearToTeacherStatusReports1687115195304'), -(1687171083496, 'fillCurrentYearOnTables1687171083496'), -(1688581442248, 'updateStudentGlobalReportFixIdOnNull1688581442248'), -(1689189688623, 'updateStudentsAddCommentColumn1689189688623'), -(1689619350360, 'updateTeacherLessonReportStatusViewAddLessonConditions1689619350360'), -(1689856702136, 'addImageTable1689856702136'), -(1693688366912, 'addStudentByYearView1693688366912'), -(1693721982777, 'updateStudentByYearYearColumn1693721982777'), -(1693827099474, 'addPaymentTrackTable1693827099474'), -(1694374542167, 'addCommentToLessons1694374542167'), -(1694450301604, 'addTeacherInKlassTypeTable1694450301604'), -(1695290797452, 'updateYemotCallIncreaseHistoryLength1695290797452'), -(1695364381711, 'addIndexesForYemotCall1695364381711'), -(1696873095052, 'addTeacherSalaryReportView1696873095052'), -(1696873773338, 'updateTeacherSalaryReportView1696873773338'), -(1696875067298, 'updateViewsIds1696875067298'), -(1696875184214, 'updateViewsIdsAgain1696875184214'), -(1696879784006, 'updateStudentKlassReportAddKlassReferenceIdColumns1696879784006'), -(1696879935960, 'updateStudentKlassReportUpdateKlassReferenceIdColumns1696879935960'), -(1698175230064, 'updateTeacherReportStatusViewIdToIncludeYear1698175230064'), -(1698308766347, 'updateTeacherReportStatusViewAddLessonNameColumns1698308766347'), -(1698309566758, 'createAttReportWithReportMonthView1698309566758'), -(1698309810693, 'updateTeacherSalaryReportToUseAttReportWithReportMonth1698309810693'), -(1698310278655, 'updateTeacherLessonReportStatusToUseAttReportWithReportMonth1698310278655'), -(1698310976879, 'cosmeticChangesToViews1698310976879'), -(1698650715375, 'schemantics1698650715375'), -(1698650838088, 'updateStudentByYearToIncludeKlassIds1698650838088'), -(1698775162074, 'cosmeticChangesToViews1698775162074'), -(1698775288010, 'addSemesterToReportMonth1698775288010'), -(1698821603832, 'adColumnsToKnownAbsences1698821603832'), -(1698822192680, 'addKnownAbsenceWithReportMonthView1698822192680'), -(1699903001380, 'addKlassTypeReferenceIDsToStudentByYearView1699903001380'), -(1700683658614, 'makeAttReportAbsDecimal1700683658614'), -(1701162232786, 'removeTzFromStudentBaseKlassView1701162232786'), -(1701795323207, 'addIndexesToOptimizeTeacherReport1701795323207'), -(1702474127872, 'makeIsBaseKlassToStudentGlobalReport1702474127872'), -(1702580912725, 'addGradeNameAndAttGradeEffect1702580912725'), -(1702802919133, 'simplifyStudentKlassReportViewJoins1702802919133'), -(1703363342429, 'addEstimationToGrades1703363342429'), -(1704207273135, 'addDefaultYearToKnownAbsences1704207273135'), -(1705432003726, 'addTeacherGradeReportFileViews1705432003726'), -(1705609443991, 'addNumbersTable1705609443991'), -(1705777705679, 'adGradeEffectByUserView1705777705679'), -(1705938484628, 'addAbsCountEffectByUserView1705938484628'), -(1706608882654, 'addUserBccAddress1706608882654'), -(1706794821688, 'addStudentIndexes1706794821688'), -(1707032874492, 'makeGradeNameNullable1707032874492'), -(1707244388438, 'changeGradeToBeDecimal1707244388438'), -(1707765928446, 'addFullSuccessToImportFile1707765928446'), -(1708371629107, 'updateAttAndGradeViewAddEstimation1708371629107'), -(1708547027795, 'addAttReportIndexes1708547027795'), -(1708547635746, 'optimizeStudentBaseKlass1708547635746'), -(1708945273022, 'renameAllIndexes1708945273022'), -(1711026137081, 'makeLessonsColumnFloat1711026137081'), -(1723317958090, 'updateStudentsAddPhoneAndAddress1723317958090'), -(1723482751870, 'updateStudentKlassesReportAddStudentDetails1723482751870'), -(1727203045203, 'addYearToReportMonth1727203045203'), -(1727206071127, 'filterTeacherReportStatusByYear1727206071127'), -(1727331114248, 'addIsRevertedToAuditLog1727331114248'), -(1732025737420, 'addImportFileTable1732025737420'), -(1733151063542, 'addLessonKlassNameView1733151063542'), -(1734522156070, 'addTeacherDisplayName1734522156070'), -(1736169980504, 'addHowManyLessonsToLesson1736169980504'), -(1737837325989, 'addStudentSpecialityView1737837325989'), -(1742452916412, 'addDisplayNameToLessonAndKlass1742452916412'), -(1742461073150, 'addOrderToLessons1742461073150'), -(1743061002171, 'updateDisplayNameNullable1743061002171'), -(1748362072638, 'UpdateTablesAndViews1748362072638'), -(1748362190659, 'AddAttendanceNameTable1748362190659'), -(1749152815025, 'AddIsActiveToStudent1749152815025'), -(1749155415113, 'AddIsActiveToStudentByYear1749155415113'), -(1750016064850, 'UpdateGradeEffectViews1750016064850'), -(1753703108793, 'updateGradeEffectViews1753703108793'), -(1753706287556, 'updateGradeEffectViewsEffectNumeric1753706287556'), -(1757191402580, 'UpdateStudentKlassReportViewAddStudentReferenceId1757191402580'), -(1757865082803, 'AddFilePathToText1757865082803'), -(1759248397724, 'AddMetadataToImportFile1759248397724'), -(1761669384732, 'UpdateLessonTimeToStartTime1761669384732'), -(1762113630653, 'AddReportGroups1762113630653'), -(1762116200000, 'MigrateExistingReportsToGroups1762116200000'), -(1762188353979, 'removeReportGroupFromImportFile1762188353979'), -(1762278302946, 'AddUserIdToReportGroupSession1762278302946'), -(1762282737170, 'recreateAttReportWithReportMonth1762282737170'), -(1762283756079, 'regenerateReportGroupSessions1762283756079'), -(1763834256494, 'optimizeLessonKlassNameView1763834256494'), -(1763931783912, 'OptimizeLessonKlassJoin1763931783912'), -(1763933862682, 'OptimizeLessonKlassJsonTable1763933862682'), -(1767646406606, 'FixImportFileSchema1767646406606'), -(1767647010979, 'FixAttReportView1767647010979'), -(1767647010980, 'FixAllViews1767647010980'), -(1767647702833, 'FixDataDatesAndOverlaps1767647702833'), -(1767647800000, 'FixSchemaMisalignments1767647800000'); - --- ============================================================ --- Table: users --- Main users table --- ============================================================ -DROP TABLE IF EXISTS `users`; -CREATE TABLE `users` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(500) NOT NULL, - `email` varchar(500) DEFAULT NULL, - `password` varchar(500) DEFAULT NULL, - `phone_number` varchar(11) DEFAULT NULL, - `active` tinyint DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `effective_id` int DEFAULT NULL, - `permissions` json DEFAULT NULL, - `additionalData` json DEFAULT NULL, - `userInfo` json DEFAULT NULL, - `isPaid` tinyint(1) NOT NULL DEFAULT '0', - `paymentMethod` varchar(255) DEFAULT NULL, - `mailAddressAlias` varchar(255) DEFAULT NULL, - `mailAddressTitle` varchar(255) DEFAULT NULL, - `paymentTrackId` int DEFAULT NULL, - `bccAddress` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `user_phone_number_idx` (`phone_number`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- Password: admin123 (hashed with bcrypt) -INSERT INTO `users` (`id`, `name`, `email`, `password`, `phone_number`, `active`, `isPaid`) VALUES -(1, 'Admin User', 'admin@example.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0501234567', 1, 1), -(2, 'School Manager', 'manager@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0507654321', 1, 1), -(3, 'Test Teacher User', 'teacher@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0509876543', 1, 0), -(4, 'Data Entry User', 'dataentry@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0502468135', 1, 1), -(5, 'Principal User', 'principal@school.com', '$2b$10$rZJ5Z5Z5Z5Z5Z5Z5Z5Z5Z.Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5Z5', '0503691472', 1, 1); - --- ============================================================ --- Table: teachers --- Teachers information --- ============================================================ -DROP TABLE IF EXISTS `teachers`; -CREATE TABLE `teachers` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `tz` varchar(10) NOT NULL, - `name` varchar(500) NOT NULL, - `phone` varchar(10) DEFAULT NULL, - `phone2` varchar(10) DEFAULT NULL, - `email` varchar(500) DEFAULT NULL, - `comment` varchar(1000) DEFAULT NULL, - `displayName` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_teachers_user_tz_year` (`user_id`, `tz`, `year`), - KEY `teachers_users_idx` (`user_id`), - KEY `teachers_user_id_phone_idx` (`user_id`, `phone`), - KEY `teachers_user_id_phone2_idx` (`user_id`, `phone2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `teachers` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `phone2`, `email`, `displayName`) VALUES -(1, 1, 5786, '123456789', 'Sarah Cohen', '0501111111', '0502222222', 'sarah@school.com', 'Ms. Cohen'), -(2, 1, 5786, '234567890', 'Rachel Levi', '0503333333', NULL, 'rachel@school.com', 'Ms. Levi'), -(3, 1, 5786, '345678901', 'Miriam Goldberg', '0504444444', '0505555555', 'miriam@school.com', 'Ms. Goldberg'), -(4, 2, 5786, '456789012', 'David Klein', '0506666666', NULL, 'david@school.com', 'Mr. Klein'), -(5, 2, 5786, '567890123', 'Yael Schwartz', '0507777777', NULL, 'yael@school.com', 'Ms. Schwartz'), -(6, 1, 5786, '678901234', 'Esther Rosenberg', '0508888888', '0509999999', 'esther@school.com', 'Ms. Rosenberg'), -(7, 2, 5786, '789012345', 'Tamar Friedman', '0501231231', NULL, 'tamar@school.com', 'Ms. Friedman'), -(8, 1, 5786, '890123456', 'Leah Katz', '0502342342', NULL, 'leah@school.com', 'Ms. Katz'), -(9, 3, 5786, '901234567', 'Chana Weiss', '0503453453', NULL, 'chana@school.com', 'Ms. Weiss'), -(10, 3, 5786, '012345678', 'Rivka Stein', '0504564564', '0505675675', 'rivka@school.com', 'Ms. Stein'); - --- ============================================================ --- Table: students --- Students information --- ============================================================ -DROP TABLE IF EXISTS `students`; -CREATE TABLE `students` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `tz` varchar(10) NOT NULL, - `name` varchar(500) NOT NULL, - `comment` varchar(1000) DEFAULT NULL, - `phone` varchar(1000) DEFAULT NULL, - `address` varchar(1000) DEFAULT NULL, - `is_active` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_students_user_tz_year` (`user_id`, `tz`, `year`), - KEY `students_users_idx` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `students` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `address`, `is_active`) VALUES -(1, 1, 5786, '111111111', 'Avigail Abramson', '0521111111', '123 Main St, Jerusalem', 1), -(2, 1, 5786, '222222222', 'Bracha Ben-David', '0522222222', '456 Oak Ave, Tel Aviv', 1), -(3, 1, 5786, '333333333', 'Chaya Cohen', '0523333333', '789 Pine Rd, Haifa', 1), -(4, 1, 5786, '444444444', 'Devorah Dayan', '0524444444', '321 Elm St, Bnei Brak', 1), -(5, 1, 5786, '555555555', 'Elisheva Ezra', '0525555555', '654 Cedar Ln, Netanya', 1), -(6, 2, 5786, '666666666', 'Freida Friedman', '0526666666', '987 Maple Dr, Ashdod', 1), -(7, 2, 5786, '777777777', 'Gittel Goldstein', '0527777777', '147 Birch Ct, Petah Tikva', 1), -(8, 2, 5786, '888888888', 'Hadassah Horowitz', '0528888888', '258 Spruce Way, Ramat Gan', 1), -(9, 1, 5786, '999999999', 'Irit Israel', '0529999999', '369 Willow St, Rehovot', 1), -(10, 3, 5786, '101010101', 'Judith Jacob', '0521010101', '741 Ash Blvd, Herzliya', 1), -(11, 3, 5786, '121212121', 'Kayla Klein', '0521212121', '852 Poplar Rd, Holon', 1), -(12, 2, 5786, '131313131', 'Leah Levy', '0521313131', '963 Chestnut Ave, Bat Yam', 1), -(13, 1, 5786, '141414141', 'Malka Miller', '0521414141', '159 Sycamore Ln, Kfar Saba', 1), -(14, 1, 5786, '151515151', 'Nechama Newman', '0521515151', '357 Redwood Dr, Raanana', 1), -(15, 2, 5786, '161616161', 'Orly Ostrovsky', '0521616161', '486 Hickory Ct, Rishon LeZion', 1); - --- ============================================================ --- Table: klass_types --- Class types (base class, track, speciality, other) --- ============================================================ -DROP TABLE IF EXISTS `klass_types`; -CREATE TABLE `klass_types` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `key` int NOT NULL, - `name` varchar(500) NOT NULL, - `klassTypeEnum` varchar(255) NOT NULL DEFAULT 'אחר', - `teacher_id` varchar(10) DEFAULT NULL, - `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `klass_types_users_idx` (`user_id`), - KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `klass_types` (`id`, `user_id`, `key`, `name`, `klassTypeEnum`, `teacher_id`, `teacherReferenceId`) VALUES -(1, 1, 1, 'Aleph Class', 'כיתת אם', '123456789', 1), -(2, 1, 2, 'Bet Class', 'כיתת אם', '234567890', 2), -(3, 1, 3, 'Gimel Class', 'כיתת אם', '345678901', 3), -(4, 1, 4, 'Math Track', 'מסלול', NULL, NULL), -(5, 1, 5, 'Science Track', 'מסלול', NULL, NULL), -(6, 2, 6, 'Literature Track', 'מסלול', '456789012', 4), -(7, 2, 7, 'Computer Science', 'התמחות', '567890123', 5), -(8, 1, 8, 'Arts', 'התמחות', '678901234', 6), -(9, 1, 9, 'Music', 'התמחות', NULL, NULL), -(10, 2, 10, 'Advanced Studies', 'אחר', '789012345', 7); - --- ============================================================ --- Table: klasses --- Classes/Groups --- ============================================================ -DROP TABLE IF EXISTS `klasses`; -CREATE TABLE `klasses` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `key` int NOT NULL, - `name` varchar(500) NOT NULL, - `display_name` varchar(500) DEFAULT NULL, - `klass_type_id` int DEFAULT NULL, - `klassTypeReferenceId` int DEFAULT NULL, - `teacher_id` varchar(10) DEFAULT NULL, - `teacherReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_klasses_user_key_year` (`user_id`, `key`, `year`), - KEY `klasses_users_idx` (`user_id`), - KEY `klasses_user_id_key_idx` (`user_id`, `key`), - KEY `klasses_klass_type_reference_id_idx` (`klassTypeReferenceId`), - KEY `klasses_teacher_reference_id_idx` (`teacherReferenceId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `klasses` (`id`, `user_id`, `year`, `key`, `name`, `display_name`, `klass_type_id`, `klassTypeReferenceId`, `teacher_id`, `teacherReferenceId`) VALUES -(1, 1, 5786, 1, 'Class Aleph-1', 'א-1', 1, 1, '123456789', 1), -(2, 1, 5786, 2, 'Class Aleph-2', 'א-2', 1, 1, '234567890', 2), -(3, 1, 5786, 3, 'Class Bet-1', 'ב-1', 2, 2, '345678901', 3), -(4, 1, 5786, 4, 'Class Bet-2', 'ב-2', 2, 2, '456789012', 4), -(5, 1, 5786, 5, 'Class Gimel-1', 'ג-1', 3, 3, '567890123', 5), -(6, 2, 5786, 6, 'Math Group A', 'Math-A', 4, 4, '678901234', 6), -(7, 2, 5786, 7, 'Math Group B', 'Math-B', 4, 4, '789012345', 7), -(8, 1, 5786, 8, 'Science Group A', 'Sci-A', 5, 5, '890123456', 8), -(9, 1, 5786, 9, 'Literature Group', 'Lit', 6, 6, '901234567', 9), -(10, 2, 5786, 10, 'CS Advanced', 'CS-Adv', 7, 7, '012345678', 10); - --- ============================================================ --- Table: lessons --- Lessons/Courses --- ============================================================ -DROP TABLE IF EXISTS `lessons`; -CREATE TABLE `lessons` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `key` int NOT NULL, - `name` varchar(500) NOT NULL, - `display_name` varchar(500) DEFAULT NULL, - `klasses` varchar(450) DEFAULT NULL, - `klassReferenceIds` text, - `klass_reference_ids_json` json GENERATED ALWAYS AS (cast(concat('[',coalesce(`klassReferenceIds`,''),']') as json)) STORED, - `teacher_id` varchar(10) DEFAULT NULL, - `teacherReferenceId` int DEFAULT NULL, - `start_date` date DEFAULT NULL, - `end_date` date DEFAULT NULL, - `comment` varchar(1000) DEFAULT NULL, - `how_many_lessons` float DEFAULT NULL, - `order` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_lessons_user_key_year` (`user_id`, `key`, `year`), - KEY `lessons_users_idx` (`user_id`), - KEY `lessons_user_id_key_idx` (`user_id`, `key`), - KEY `lessons_teacher_reference_id_idx` (`teacherReferenceId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `lessons` (`id`, `user_id`, `year`, `key`, `name`, `display_name`, `klasses`, `klassReferenceIds`, `teacher_id`, `teacherReferenceId`, `start_date`, `end_date`, `how_many_lessons`, `order`) VALUES -(1, 1, 5786, 1, 'Mathematics', 'Math', '1,2', '1,2', '123456789', 1, '2025-09-01', '2025-12-31', 40, 1), -(2, 1, 5786, 2, 'Hebrew', 'Hebrew', '1,2,3', '1,2,3', '234567890', 2, '2025-09-01', '2025-12-31', 45, 2), -(3, 1, 5786, 3, 'English', 'English', '3,4', '3,4', '345678901', 3, '2025-09-01', '2025-12-31', 38, 3), -(4, 1, 5786, 4, 'Science', 'Science', '5', '5', '456789012', 4, '2025-09-01', '2025-12-31', 42, 4), -(5, 1, 5786, 5, 'History', 'History', '4,5', '4,5', '567890123', 5, '2025-09-01', '2025-12-31', 35, 5), -(6, 2, 5786, 6, 'Geography', 'Geo', '6,7', '6,7', '678901234', 6, '2025-09-01', '2025-12-31', 30, 6), -(7, 2, 5786, 7, 'Computer Studies', 'CS', '10', '10', '789012345', 7, '2025-09-01', '2025-12-31', 48, 7), -(8, 1, 5786, 8, 'Literature', 'Lit', '9', '9', '890123456', 8, '2025-09-01', '2025-12-31', 36, 8), -(9, 1, 5786, 9, 'Physics', 'Physics', '8', '8', '901234567', 9, '2025-09-01', '2025-12-31', 44, 9), -(10, 3, 5786, 10, 'Chemistry', 'Chem', '8', '8', '012345678', 10, '2025-09-01', '2025-12-31', 41, 10); - --- ============================================================ --- Table: student_klasses --- Student-Class assignments --- ============================================================ -DROP TABLE IF EXISTS `student_klasses`; -CREATE TABLE `student_klasses` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `student_tz` varchar(10) DEFAULT NULL, - `studentReferenceId` int DEFAULT NULL, - `klass_id` int DEFAULT NULL, - `klassReferenceId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `student_klasses_users_idx` (`user_id`), - KEY `student_klasses_user_year_idx` (`user_id`, `year`), - KEY `student_klasses_student_reference_id_year_idx` (`studentReferenceId`, `year`), - KEY `student_klasses_user_klass_year_idx` (`user_id`, `klassReferenceId`, `year`), - KEY `student_klasses_user_student_klass_year_idx` (`user_id`, `studentReferenceId`, `klassReferenceId`, `year`), - KEY `IDX_student_klasses_studentReferenceId_year` (`studentReferenceId`, `year`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `student_klasses` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`) VALUES -(1, 1, 5786, '111111111', 1, 1, 1), -(2, 1, 5786, '222222222', 2, 1, 1), -(3, 1, 5786, '333333333', 3, 2, 2), -(4, 1, 5786, '444444444', 4, 2, 2), -(5, 1, 5786, '555555555', 5, 3, 3), -(6, 2, 5786, '666666666', 6, 4, 4), -(7, 2, 5786, '777777777', 7, 5, 5), -(8, 2, 5786, '888888888', 8, 6, 6), -(9, 1, 5786, '999999999', 9, 7, 7), -(10, 3, 5786, '101010101', 10, 8, 8), -(11, 3, 5786, '121212121', 11, 9, 9), -(12, 2, 5786, '131313131', 12, 10, 10), -(13, 1, 5786, '141414141', 13, 1, 1), -(14, 1, 5786, '151515151', 14, 3, 3), -(15, 2, 5786, '161616161', 15, 5, 5); - --- ============================================================ --- Table: att_reports --- Attendance reports --- ============================================================ -DROP TABLE IF EXISTS `att_reports`; -CREATE TABLE `att_reports` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `student_tz` varchar(10) DEFAULT NULL, - `studentReferenceId` int DEFAULT NULL, - `teacher_id` varchar(10) DEFAULT NULL, - `teacherReferenceId` int DEFAULT NULL, - `klass_id` int DEFAULT NULL, - `klassReferenceId` int DEFAULT NULL, - `lesson_id` int DEFAULT NULL, - `lessonReferenceId` int DEFAULT NULL, - `report_date` date NOT NULL, - `how_many_lessons` float DEFAULT NULL, - `abs_count` float NOT NULL DEFAULT '0', - `approved_abs_count` float NOT NULL DEFAULT '0', - `comments` varchar(500) DEFAULT NULL, - `sheet_name` varchar(100) DEFAULT NULL, - `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `att_users_idx` (`user_id`), - KEY `att_user_sheet_name_lession_klass_year_idx` (`user_id`, `sheet_name`, `lessonReferenceId`, `klassReferenceId`, `year`), - KEY `att_user_year_idx` (`user_id`, `year`), - KEY `att_user_year_student_reference_id_idx` (`user_id`, `studentReferenceId`, `year`), - KEY `att_user_year_teacher_reference_id_idx` (`user_id`, `teacherReferenceId`, `year`), - KEY `att_user_year_lesson_reference_id_idx` (`user_id`, `lessonReferenceId`, `year`), - KEY `att_reports_student_reference_id_idx` (`studentReferenceId`), - KEY `att_reports_teacher_reference_id_idx` (`teacherReferenceId`), - KEY `att_reports_klass_reference_id_idx` (`klassReferenceId`), - KEY `att_reports_lesson_reference_id_idx` (`lessonReferenceId`), - KEY `att_reports_report_date_idx` (`report_date`), - KEY `att_reports_report_group_session_id_idx` (`reportGroupSessionId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `att_reports` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `abs_count`, `approved_abs_count`) VALUES -(1, 1, 5786, '111111111', 1, '123456789', 1, 1, 1, 1, 1, '2025-10-01', 2, 0, 0), -(2, 1, 5786, '222222222', 2, '123456789', 1, 1, 1, 1, 1, '2025-10-01', 2, 1, 0), -(3, 1, 5786, '333333333', 3, '234567890', 2, 2, 2, 2, 2, '2025-10-01', 2, 0, 0), -(4, 1, 5786, '444444444', 4, '234567890', 2, 2, 2, 2, 2, '2025-10-01', 2, 0.5, 0.5), -(5, 1, 5786, '555555555', 5, '345678901', 3, 3, 3, 3, 3, '2025-10-01', 2, 0, 0), -(6, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 4, 4, '2025-10-02', 2, 1.5, 1), -(7, 2, 5786, '777777777', 7, '567890123', 5, 5, 5, 5, 5, '2025-10-02', 2, 0, 0), -(8, 2, 5786, '888888888', 8, '678901234', 6, 6, 6, 6, 6, '2025-10-02', 1, 0, 0), -(9, 1, 5786, '999999999', 9, '789012345', 7, 7, 7, 7, 7, '2025-10-03', 2, 2, 0), -(10, 3, 5786, '101010101', 10, '890123456', 8, 8, 8, 8, 8, '2025-10-03', 2, 0, 0), -(11, 1, 5786, '111111111', 1, '234567890', 2, 1, 1, 2, 2, '2025-10-05', 2, 0, 0), -(12, 1, 5786, '333333333', 3, '345678901', 3, 2, 2, 3, 3, '2025-10-05', 2, 1, 1), -(13, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 5, 5, '2025-10-06', 2, 0, 0), -(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '2025-10-07', 2, 0.5, 0), -(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '2025-10-08', 2, 0, 0); - --- ============================================================ --- Table: grades --- Grades/Marks --- ============================================================ -DROP TABLE IF EXISTS `grades`; -CREATE TABLE `grades` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `student_tz` varchar(10) DEFAULT NULL, - `studentReferenceId` int DEFAULT NULL, - `teacher_id` varchar(10) DEFAULT NULL, - `teacherReferenceId` int DEFAULT NULL, - `klass_id` int DEFAULT NULL, - `klassReferenceId` int DEFAULT NULL, - `lesson_id` int DEFAULT NULL, - `lessonReferenceId` int DEFAULT NULL, - `report_date` date NOT NULL, - `how_many_lessons` float DEFAULT NULL, - `grade` float NOT NULL DEFAULT '0', - `estimation` varchar(500) DEFAULT NULL, - `comments` varchar(500) DEFAULT NULL, - `reportGroupSessionId` int DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `grades_users_idx` (`user_id`), - KEY `grades_user_lesson_klass_year_idx` (`user_id`, `lessonReferenceId`, `klassReferenceId`, `year`), - KEY `grades_student_reference_id_idx` (`studentReferenceId`), - KEY `grades_teacher_reference_id_idx` (`teacherReferenceId`), - KEY `grades_klass_reference_id_idx` (`klassReferenceId`), - KEY `grades_lesson_reference_id_idx` (`lessonReferenceId`), - KEY `grades_report_date_idx` (`report_date`), - KEY `grades_report_group_session_id_idx` (`reportGroupSessionId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `grades` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `grade`, `estimation`) VALUES -(1, 1, 5786, '111111111', 1, '123456789', 1, 1, 1, 1, 1, '2025-10-15', 10, 95.5, 'Excellent'), -(2, 1, 5786, '222222222', 2, '123456789', 1, 1, 1, 1, 1, '2025-10-15', 10, 88.0, 'Very Good'), -(3, 1, 5786, '333333333', 3, '234567890', 2, 2, 2, 2, 2, '2025-10-15', 12, 92.5, 'Excellent'), -(4, 1, 5786, '444444444', 4, '234567890', 2, 2, 2, 2, 2, '2025-10-15', 12, 85.0, 'Good'), -(5, 1, 5786, '555555555', 5, '345678901', 3, 3, 3, 3, 3, '2025-10-15', 10, 90.0, 'Very Good'), -(6, 2, 5786, '666666666', 6, '456789012', 4, 4, 4, 4, 4, '2025-10-16', 11, 93.5, 'Excellent'), -(7, 2, 5786, '777777777', 7, '567890123', 5, 5, 5, 5, 5, '2025-10-16', 9, 87.5, 'Very Good'), -(8, 2, 5786, '888888888', 8, '678901234', 6, 6, 6, 6, 6, '2025-10-16', 8, 91.0, 'Excellent'), -(9, 1, 5786, '999999999', 9, '789012345', 7, 7, 7, 7, 7, '2025-10-17', 12, 78.5, 'Good'), -(10, 3, 5786, '101010101', 10, '890123456', 8, 8, 8, 8, 8, '2025-10-17', 10, 94.0, 'Excellent'), -(11, 1, 5786, '111111111', 1, '234567890', 2, 1, 1, 2, 2, '2025-10-20', 12, 89.5, 'Very Good'), -(12, 1, 5786, '333333333', 3, '345678901', 3, 2, 2, 3, 3, '2025-10-20', 10, 96.0, 'Outstanding'), -(13, 2, 5786, '666666666', 6, '567890123', 5, 4, 4, 5, 5, '2025-10-21', 9, 86.0, 'Good'), -(14, 1, 5786, '555555555', 5, '567890123', 5, 3, 3, 5, 5, '2025-10-22', 9, 91.5, 'Excellent'), -(15, 2, 5786, '888888888', 8, '789012345', 7, 7, 7, 7, 7, '2025-10-23', 12, 88.5, 'Very Good'); - --- ============================================================ --- Table: known_absences --- Known/Approved absences --- ============================================================ -DROP TABLE IF EXISTS `known_absences`; -CREATE TABLE `known_absences` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `year` int DEFAULT NULL, - `student_tz` varchar(10) DEFAULT NULL, - `studentReferenceId` int DEFAULT NULL, - `klass_id` int DEFAULT NULL, - `klassReferenceId` int DEFAULT NULL, - `lesson_id` int DEFAULT NULL, - `lessonReferenceId` int DEFAULT NULL, - `report_date` date NOT NULL, - `absnce_count` int DEFAULT NULL, - `absnce_code` int DEFAULT NULL, - `sender_name` varchar(100) DEFAULT NULL, - `reason` varchar(500) DEFAULT NULL, - `comment` varchar(500) DEFAULT NULL, - `isApproved` tinyint(1) NOT NULL DEFAULT '1', - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `known_users_idx` (`user_id`), - KEY `IDX_known_absences_studentReferenceId_year` (`studentReferenceId`, `year`), - KEY `known_absences_student_reference_id_idx` (`studentReferenceId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `known_absences` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `absnce_count`, `absnce_code`, `sender_name`, `reason`, `isApproved`) VALUES -(1, 1, 5786, '222222222', 2, 1, 1, 1, 1, '2025-10-01', 1, 1, 'Parent', 'Medical appointment', 1), -(2, 1, 5786, '444444444', 4, 2, 2, 2, 2, '2025-10-01', 1, 2, 'Parent', 'Family event', 1), -(3, 2, 5786, '666666666', 6, 4, 4, 4, 4, '2025-10-02', 2, 1, 'Doctor', 'Sick', 1), -(4, 1, 5786, '999999999', 9, 7, 7, 7, 7, '2025-10-03', 2, 3, 'Parent', 'Religious holiday', 1), -(5, 1, 5786, '333333333', 3, 2, 2, 3, 3, '2025-10-05', 1, 1, 'Parent', 'Illness', 1), -(6, 2, 5786, '888888888', 8, 7, 7, 7, 7, '2025-10-08', 1, 4, 'School', 'School trip', 1), -(7, 1, 5786, '555555555', 5, 3, 3, 5, 5, '2025-10-07', 1, 2, 'Parent', 'Personal matter', 0), -(8, 1, 5786, '111111111', 1, 1, 1, 1, 1, '2025-10-10', 1, 1, 'Parent', 'Medical checkup', 1), -(9, 2, 5786, '777777777', 7, 5, 5, 5, 5, '2025-10-12', 1, 3, 'Parent', 'Family celebration', 1), -(10, 3, 5786, '121212121', 11, 9, 9, NULL, NULL, '2025-10-14', 1, 1, 'Parent', 'Cold', 1); - --- ============================================================ --- Table: report_month --- Report month periods --- ============================================================ -DROP TABLE IF EXISTS `report_month`; -CREATE TABLE `report_month` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `name` varchar(255) NOT NULL, - `startDate` date NOT NULL, - `endDate` date NOT NULL, - `semester` varchar(255) NOT NULL DEFAULT 'שנתי', - `year` int DEFAULT NULL, - - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `report_month_user_id_idx` (`userId`), - KEY `report_month_user_id_start_date_end_date_idx` (`userId`, `startDate`, `endDate`), - KEY `report_month_user_id_year_idx` (`userId`, `year`), - KEY `report_month_user_id_start_date_end_date_year_idx` (`userId`, `startDate`, `endDate`, `year`), - KEY `report_month_start_date_idx` (`startDate`), - KEY `report_month_end_date_idx` (`endDate`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `report_month` (`id`, `userId`, `name`, `startDate`, `endDate`, `semester`, `year`) VALUES -(1, 1, 'September 2025', '2025-09-01', '2025-09-30', 'א', 5786), -(2, 1, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), -(3, 1, 'November 2025', '2025-11-01', '2025-11-30', 'א', 5786), -(4, 1, 'December 2025', '2025-12-01', '2025-12-31', 'א', 5786), -(5, 2, 'September 2025', '2025-09-01', '2025-09-30', 'א', 5786), -(6, 2, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), -(9, 3, 'October 2025', '2025-10-01', '2025-10-31', 'א', 5786), -(10, 3, 'November 2025', '2025-11-01', '2025-11-30', 'א', 5786); - --- ============================================================ --- Table: grade_names --- Custom grade name mappings --- ============================================================ -DROP TABLE IF EXISTS `grade_names`; -CREATE TABLE `grade_names` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `key` int NOT NULL, - `name` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `grade_names_user_id_idx` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `grade_names` (`id`, `user_id`, `key`, `name`) VALUES -(1, 1, 100, 'Outstanding'), -(2, 1, 95, 'Excellent'), -(3, 1, 90, 'Very Good'), -(4, 1, 85, 'Good'), -(5, 1, 80, 'Above Average'), -(6, 2, 100, 'Perfect'), -(7, 2, 90, 'Great'), -(8, 2, 80, 'Good'), -(9, 1, 75, 'Satisfactory'), -(10, 3, 95, 'Excellent Work'); - --- ============================================================ --- Table: attendance_names --- Custom attendance name mappings --- ============================================================ -DROP TABLE IF EXISTS `attendance_names`; -CREATE TABLE `attendance_names` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `key` int NOT NULL, - `name` varchar(500) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `attendance_names_user_id_idx` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `attendance_names` (`id`, `user_id`, `key`, `name`) VALUES -(1, 1, 1, 'Medical'), -(2, 1, 2, 'Family Event'), -(3, 1, 3, 'Religious Holiday'), -(4, 1, 4, 'School Activity'), -(5, 1, 5, 'Personal'), -(6, 2, 1, 'Sick'), -(7, 2, 2, 'Appointment'), -(8, 2, 3, 'Holiday'), -(9, 3, 1, 'Medical Leave'), -(10, 3, 2, 'Other'); - --- ============================================================ --- Table: report_groups --- Report groups for batch reporting --- ============================================================ -DROP TABLE IF EXISTS `report_groups`; -CREATE TABLE `report_groups` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `name` varchar(255) NOT NULL, - `topic` varchar(255) DEFAULT NULL, - `signatureData` longtext, - `teacherReferenceId` int DEFAULT NULL, - `lessonReferenceId` int DEFAULT NULL, - `klassReferenceId` int DEFAULT NULL, - `year` int DEFAULT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `report_groups_user_id_idx` (`user_id`), - KEY `report_groups_user_id_year_idx` (`user_id`, `year`), - KEY `report_groups_teacher_reference_id_idx` (`teacherReferenceId`), - KEY `report_groups_lesson_reference_id_idx` (`lessonReferenceId`), - KEY `report_groups_klass_reference_id_idx` (`klassReferenceId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `report_groups` (`id`, `user_id`, `name`, `topic`, `teacherReferenceId`, `lessonReferenceId`, `klassReferenceId`, `year`) VALUES -(1, 1, 'Math Class A - October', 'Algebra basics', 1, 1, 1, 5786), -(2, 1, 'Hebrew Class - October', 'Grammar and composition', 2, 2, 1, 5786), -(3, 1, 'English Class - October', 'Reading comprehension', 3, 3, 3, 5786), -(4, 2, 'Science Class - October', 'Biology fundamentals', 6, 6, 6, 5786), -(5, 2, 'CS Advanced - October', 'Programming basics', 7, 7, 10, 5786); - --- ============================================================ --- Table: report_group_sessions --- Individual sessions within report groups --- ============================================================ -DROP TABLE IF EXISTS `report_group_sessions`; -CREATE TABLE `report_group_sessions` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `reportGroupId` int NOT NULL, - `sessionDate` date NOT NULL, - `startTime` time DEFAULT NULL, - `endTime` time DEFAULT NULL, - `topic` varchar(255) DEFAULT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `report_group_sessions_user_id_idx` (`userId`), - KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), - KEY `report_group_sessions_session_date_idx` (`sessionDate`), - CONSTRAINT `FK_report_group_sessions_reportGroupId` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDate`, `startTime`, `endTime`, `topic`) VALUES -(1, 1, 1, '2025-10-01', '08:00:00', '09:30:00', 'Introduction to Algebra'), -(2, 1, 1, '2025-10-08', '08:00:00', '09:30:00', 'Linear equations'), -(3, 1, 2, '2025-10-02', '10:00:00', '11:30:00', 'Grammar review'), -(4, 1, 3, '2025-10-03', '13:00:00', '14:30:00', 'Reading strategies'), -(5, 2, 4, '2025-10-04', '09:00:00', '10:30:00', 'Cell structure'), -(6, 2, 5, '2025-10-05', '11:00:00', '12:30:00', 'Variables and data types'), -(7, 1, 1, '2025-10-15', '08:00:00', '09:30:00', 'Quadratic equations'), -(8, 1, 2, '2025-10-16', '10:00:00', '11:30:00', 'Essay writing'), -(9, 2, 4, '2025-10-18', '09:00:00', '10:30:00', 'Photosynthesis'), -(10, 2, 5, '2025-10-19', '11:00:00', '12:30:00', 'Control structures'); - --- ============================================================ --- Table: typeorm_metadata --- TypeORM metadata for generated columns and other metadata --- ============================================================ -DROP TABLE IF EXISTS `typeorm_metadata`; -CREATE TABLE `typeorm_metadata` ( - `type` varchar(255) NOT NULL, - `schema` varchar(255) DEFAULT NULL, - `table` varchar(255) DEFAULT NULL, - `name` varchar(255) DEFAULT NULL, - `value` text -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `typeorm_metadata` (`type`, `schema`, `table`, `name`, `value`) VALUES -('GENERATED_COLUMN', 'mysql_database', 'lessons', 'klass_reference_ids_json', 'CAST(CONCAT(''['', COALESCE(klassReferenceIds, ''''), '']'') AS JSON)'); - -SET FOREIGN_KEY_CHECKS = 1; - --- ============================================================ --- Views --- Critical view entities required by the application --- ============================================================ - --- View: student_base_klass -CREATE OR REPLACE VIEW `student_base_klass` AS -SELECT - `student_klasses`.`studentReferenceId` AS `id`, - `student_klasses`.`user_id` AS `user_id`, - `student_klasses`.`year` AS `year`, - GROUP_CONCAT(DISTINCT IF(`klass_types`.`klassTypeEnum` = 'כיתת אם', `klasses`.`name`, NULL) SEPARATOR ', ') AS `base_klass` -FROM `student_klasses` -LEFT JOIN `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` -LEFT JOIN `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` -GROUP BY `studentReferenceId`, `user_id`, `year`; - --- View: lesson_klass_name -CREATE OR REPLACE VIEW `lesson_klass_name` AS -SELECT lessons.id AS id, - lessons.user_id AS user_id, - GROUP_CONCAT(DISTINCT klasses.name SEPARATOR ', ') AS name -FROM lessons - LEFT JOIN JSON_TABLE( - lessons.klass_reference_ids_json, - "$[*]" COLUMNS(klass_id INT PATH "$") - ) AS jt ON 1 = 1 - LEFT JOIN klasses ON klasses.id = jt.klass_id -GROUP BY lessons.id, - lessons.user_id; - - --- ============================================================ --- Table: texts --- Text content management --- ============================================================ -DROP TABLE IF EXISTS `texts`; -CREATE TABLE `texts` ( - `id` int UNSIGNED NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `name` varchar(100) NOT NULL, - `description` varchar(500) NOT NULL, - `value` varchar(10000) NOT NULL, - `filepath` varchar(255) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `texts_users_idx` (`user_id`), - KEY `texts_name_idx` (`name`), - KEY `texts_user_id_name_idx` (`user_id`, `name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `texts` (`id`, `user_id`, `name`, `description`, `value`) VALUES -(1, 1, 'welcome_message', 'Welcome message for homepage', 'Welcome to our school management system'), -(2, 1, 'footer_text', 'Footer copyright text', '© 5786 School Management System'), -(3, 2, 'announcement', 'School announcement', 'Important: School will be closed on holidays'); - --- ============================================================ --- Table: audit_log --- Audit log for tracking changes --- ============================================================ -DROP TABLE IF EXISTS `audit_log`; -CREATE TABLE `audit_log` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `entityId` int NOT NULL, - `entityName` varchar(255) NOT NULL, - `operation` varchar(255) NOT NULL, - `entityData` text NOT NULL, - `isReverted` tinyint(1) NOT NULL DEFAULT '0', - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `audit_log` (`id`, `userId`, `entityId`, `entityName`, `operation`, `entityData`) VALUES -(1, 1, 1, 'Student', 'CREATE', '{"name": "Avigail Abramson", "tz": "111111111"}'), -(2, 1, 1, 'Teacher', 'UPDATE', '{"id": 1, "phone": "0501111111"}'); - --- ============================================================ --- Table: yemot_call --- Phone system call tracking --- ============================================================ -DROP TABLE IF EXISTS `yemot_call`; -CREATE TABLE `yemot_call` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `apiCallId` varchar(255) NOT NULL, - `phone` varchar(255) NOT NULL, - `history` mediumtext NOT NULL, - `currentStep` varchar(255) NOT NULL, - `data` text DEFAULT NULL, - `isOpen` tinyint NOT NULL, - `hasError` tinyint NOT NULL DEFAULT 0, - `errorMessage` varchar(255) DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `yemot_call_api_call_id_idx` (`apiCallId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: mail_address --- Email address management --- ============================================================ -DROP TABLE IF EXISTS `mail_address`; -CREATE TABLE `mail_address` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `alias` varchar(255) NOT NULL, - `entity` varchar(255) NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_mail_address_userId_entity` (`userId`, `entity`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: recieved_mail --- Received email tracking --- ============================================================ -DROP TABLE IF EXISTS `recieved_mail`; -CREATE TABLE `recieved_mail` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `mailData` text NOT NULL, - `from` varchar(255) NOT NULL, - `to` varchar(255) NOT NULL, - `subject` text DEFAULT NULL, - `body` text DEFAULT NULL, - `entityName` varchar(255) NOT NULL, - `importFileIds` text NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: page --- CMS pages --- ============================================================ -DROP TABLE IF EXISTS `page`; -CREATE TABLE `page` ( - `id` int NOT NULL AUTO_INCREMENT, - `description` varchar(255) NOT NULL, - `value` longtext NOT NULL, - `order` int DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: image --- Image storage --- ============================================================ -DROP TABLE IF EXISTS `image`; -CREATE TABLE `image` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `fileDataSrc` mediumtext NOT NULL, - `fileDataTitle` text NOT NULL, - `imageTarget` varchar(255) NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `IDX_image_userId_imageTarget` (`userId`, `imageTarget`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: payment_track --- Payment tracking information --- ============================================================ -DROP TABLE IF EXISTS `payment_track`; -CREATE TABLE `payment_track` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `description` longtext NOT NULL, - `monthlyPrice` int NOT NULL, - `annualPrice` int NOT NULL, - `studentNumberLimit` int NOT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updatedAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `payment_track` (`id`, `name`, `description`, `monthlyPrice`, `annualPrice`, `studentNumberLimit`) VALUES -(1, 'Basic Plan', 'Basic features', 100, 1000, 50), -(2, 'Standard Plan', 'Standard features', 200, 2000, 150), -(3, 'Premium Plan', 'All features', 300, 3000, 500); - --- ============================================================ --- Table: import_file --- File import tracking --- ============================================================ -DROP TABLE IF EXISTS `import_file`; -CREATE TABLE `import_file` ( - `id` int NOT NULL AUTO_INCREMENT, - `userId` int NOT NULL, - `fileName` varchar(255) NOT NULL, - `fileSource` varchar(255) NOT NULL, - `entityIds` text NOT NULL, - `entityName` varchar(255) NOT NULL, - `fullSuccess` tinyint(1) DEFAULT NULL, - `response` varchar(255) DEFAULT NULL, - `metadata` json DEFAULT NULL, - `createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ============================================================ --- Table: att_grade_effect --- Attendance and grade effect tracking --- ============================================================ -DROP TABLE IF EXISTS `att_grade_effect`; -CREATE TABLE `att_grade_effect` ( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` int NOT NULL, - `percents` int DEFAULT NULL, - `count` int DEFAULT NULL, - `effect` int NOT NULL, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `att_grade_effect_user_id_idx` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `att_grade_effect` (`user_id`, `percents`, `count`, `effect`) VALUES -(1, 90, 2, 5), -(1, 80, 3, 0), -(1, 70, 4, -5); - --- ============================================================ --- Helper Table: numbers (Required for View logic) --- ============================================================ - -DROP TABLE IF EXISTS `numbers`; -CREATE TABLE `numbers` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `number` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -INSERT INTO `numbers` (`id`, `number`) VALUES -(1, '1'),(2, '2'),(3, '3'),(4, '4'),(5, '5'),(6, '6'),(7, '7'),(8, '8'),(9, '9'),(10, '10'), -(11, '11'),(12, '12'),(13, '13'),(14, '14'),(15, '15'),(16, '16'),(17, '17'),(18, '18'),(19, '19'),(20, '20'), -(21, '21'),(22, '22'),(23, '23'),(24, '24'),(25, '25'),(26, '26'),(27, '27'),(28, '28'),(29, '29'),(30, '30'), -(31, '31'),(32, '32'),(33, '33'),(34, '34'),(35, '35'),(36, '36'),(37, '37'),(38, '38'),(39, '39'),(40, '40'), -(41, '41'),(42, '42'),(43, '43'),(44, '44'),(45, '45'),(46, '46'),(47, '47'),(48, '48'),(49, '49'),(50, '50'), -(51, '51'),(52, '52'),(53, '53'),(54, '54'),(55, '55'),(56, '56'),(57, '57'),(58, '58'),(59, '59'),(60, '60'), -(61, '61'),(62, '62'),(63, '63'),(64, '64'),(65, '65'),(66, '66'),(67, '67'),(68, '68'),(69, '69'),(70, '70'), -(71, '71'),(72, '72'),(73, '73'),(74, '74'),(75, '75'),(76, '76'),(77, '77'),(78, '78'),(79, '79'),(80, '80'), -(81, '81'),(82, '82'),(83, '83'),(84, '84'),(85, '85'),(86, '86'),(87, '87'),(88, '88'),(89, '89'),(90, '90'), -(91, '91'),(92, '92'),(93, '93'),(94, '94'),(95, '95'),(96, '96'),(97, '97'),(98, '98'),(99, '99'),(100, '100'), -(101, '0'); - --- ============================================================ --- Additional Views - All TypeORM View Entities --- ============================================================ - --- View: att_report_and_grade -CREATE OR REPLACE VIEW `att_report_and_grade` AS -SELECT - CONCAT('a-', id) AS id, - 'att' as `type`, - user_id, - `year`, - studentReferenceId, - teacherReferenceId, - lessonReferenceId, - klassReferenceId, - report_date, - how_many_lessons, - abs_count, - approved_abs_count, - NULL AS grade, - NULL AS estimation, - comments, - sheet_name -FROM att_reports -UNION -SELECT - CONCAT('g-', id) AS id, - 'grade' as `type`, - user_id, - `year`, - studentReferenceId, - teacherReferenceId, - lessonReferenceId, - klassReferenceId, - report_date, - how_many_lessons, - NULL AS abs_count, - NULL AS approved_abs_count, - grade, - estimation, - comments, - NULL AS sheet_name -FROM grades; - --- View: student_global_report -CREATE OR REPLACE VIEW `student_global_report` AS -SELECT `atag`.`year` AS `year`, - `atag`.`teacherReferenceId` AS `teacherReferenceId`, - CONCAT( - COALESCE(studentReferenceId, "null"), - "_", - COALESCE(`atag`.`teacherReferenceId`, "null"), - "_", - COALESCE(klassReferenceId, "null"), - "_", - COALESCE(lessonReferenceId, "null"), - "_", - COALESCE(`atag`.`user_id`, "null"), - "_", - COALESCE(`atag`.`year`, "null") - ) AS `id`, - `atag`.`user_id` AS `user_id`, - studentReferenceId, - klassReferenceId, - lessonReferenceId, - CASE - WHEN `klass_types`.`klassTypeEnum` = "כיתת אם" THEN 1 - ELSE 0 - END AS `isBaseKlass`, - SUM(how_many_lessons) AS `lessons_count`, - SUM(abs_count) AS `abs_count`, - AVG(grade) AS `grade_avg` -FROM `att_report_and_grade` `atag` - LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `atag`.`klassReferenceId` - LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` -GROUP BY studentReferenceId, - `atag`.`teacherReferenceId`, - klassReferenceId, - lessonReferenceId, - `atag`.`user_id`, - `atag`.`year`; - --- View: student_speciality -CREATE OR REPLACE VIEW `student_speciality` AS -SELECT - student_klasses.studentReferenceId AS id, - student_klasses.user_id, - student_klasses.year, - GROUP_CONCAT(DISTINCT IF(klass_types.klassTypeEnum = 'התמחות', klasses.name, NULL) SEPARATOR ', ') AS base_klass -FROM student_klasses -LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId -LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId -GROUP BY studentReferenceId, user_id, year; - --- View: student_by_year -CREATE OR REPLACE VIEW `student_by_year` AS -SELECT - students.id, - students.user_id, - students.tz, - students.name, - students.is_active AS isActive, - GROUP_CONCAT(DISTINCT student_klasses.year) AS year, - GROUP_CONCAT(DISTINCT student_klasses.klassReferenceId) AS klassReferenceIds, - GROUP_CONCAT(DISTINCT klasses.klassTypeReferenceId) AS klassTypeReferenceIds -FROM student_klasses -LEFT JOIN students ON students.id = student_klasses.studentReferenceId -LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId -GROUP BY students.id; - --- View: student_klasses_report -CREATE OR REPLACE VIEW student_klasses_report AS -SELECT student_klasses.year AS year, - students.id AS id, - students.id AS student_reference_id, - students.tz AS student_tz, - students.name AS student_name, - student_klasses.user_id AS user_id, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'כיתת אם', - student_klasses.klassReferenceId, - NULL - ) SEPARATOR ',' - ) AS klassReferenceId_1, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'מסלול', - student_klasses.klassReferenceId, - NULL - ) SEPARATOR ',' - ) AS klassReferenceId_2, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'התמחות', - student_klasses.klassReferenceId, - NULL - ) SEPARATOR ',' - ) AS klassReferenceId_3, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, - student_klasses.klassReferenceId, - NULL - ) SEPARATOR ',' - ) AS klassReferenceId_null, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'כיתת אם', - klasses.name, - NULL - ) SEPARATOR ', ' - ) AS klass_name_1, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'מסלול', - klasses.name, - NULL - ) SEPARATOR ', ' - ) AS klass_name_2, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'התמחות', - klasses.name, - NULL - ) SEPARATOR ', ' - ) AS klass_name_3, - GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, - klasses.name, - NULL - ) SEPARATOR ', ' - ) AS klass_name_null -FROM student_klasses - LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId - LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId - LEFT JOIN students ON students.id = student_klasses.studentReferenceId -GROUP BY students.id, - student_klasses.user_id, - student_klasses.year; - --- View: student_percent_report -CREATE OR REPLACE VIEW `student_percent_report` AS -SELECT id, - user_id, - year, - studentReferenceId, - teacherReferenceId, - klassReferenceId, - lessonReferenceId, - lessons_count, - abs_count, - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) AS `abs_percents`, - ( - 1 - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) - ) AS `att_percents`, - grade_avg / 100 AS `grade_avg` -FROM `student_global_report` `sgr`; - --- View: text_by_user -CREATE OR REPLACE VIEW `text_by_user` AS -SELECT `t_base`.`name` AS `name`, - `t_base`.`description` AS `description`, - `users`.`id` AS `userId`, - `t_user`.`id` AS `overrideTextId`, - CONCAT(`users`.`id`, "_", `t_base`.`id`) AS `id`, - COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, - COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` -FROM `texts` `t_base` - LEFT JOIN `users` `users` ON `users`.`effective_id` is null - LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` - AND `t_user`.`user_id` = `users`.`id` -WHERE `t_base`.`user_id` = 0 -ORDER BY `users`.`id` ASC, - `t_base`.`id` ASC; - --- View: att_report_with_report_month -CREATE OR REPLACE VIEW att_report_with_report_month AS -SELECT report_months.id AS reportMonthReferenceId, - att_reports.* -FROM att_reports - LEFT JOIN report_month report_months ON att_reports.user_id = report_months.userId - AND att_reports.report_date <= report_months.endDate - AND att_reports.report_date >= report_months.startDate; - --- View: grade_with_report_month -CREATE OR REPLACE VIEW `grade_with_report_month` AS -SELECT `report_months`.`id` AS `reportMonthReferenceId`, - grades.* -FROM `grades` `grades` - LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` - AND `grades`.`report_date` <= `report_months`.`endDate` - AND `grades`.`report_date` >= `report_months`.`startDate`; - --- View: known_absence_with_report_month -CREATE OR REPLACE VIEW known_absence_with_report_month AS -SELECT report_months.id AS reportMonthReferenceId, - known_absences.* -FROM known_absences - LEFT JOIN report_month report_months ON known_absences.user_id = report_months.userId - AND known_absences.report_date <= report_months.endDate - AND known_absences.report_date >= report_months.startDate; - --- View: grade_effect_by_user -CREATE OR REPLACE VIEW `grade_effect_by_user` AS -SELECT `users`.`id` AS `userId`, - CONCAT(`users`.`id`, "_", numbers.number) AS `id`, - numbers.number AS `number`, - CAST( - COALESCE( - SUBSTRING_INDEX( - MAX( - CASE - WHEN `att_grade_effect`.`percents` <= numbers.number THEN CONCAT( - LPAD(`att_grade_effect`.`percents`, 10, '0'), - '|', - `att_grade_effect`.`effect` - ) - ELSE NULL - END - ), - '|', - -1 - ), - '0' - ) AS SIGNED - ) + 0 AS `effect` -FROM `numbers` `numbers` - LEFT JOIN `users` `users` ON 1 = 1 - LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` -GROUP BY `users`.`id`, - numbers.number -ORDER BY `users`.`id` ASC, - numbers.number ASC; - --- View: abs_count_effect_by_user -CREATE OR REPLACE VIEW `abs_count_effect_by_user` AS -SELECT `users`.`id` AS `userId`, - CONCAT(`users`.`id`, "_", numbers.number) AS `id`, - numbers.number AS `number`, - CAST( - COALESCE( - SUBSTRING_INDEX( - MAX( - CASE - WHEN `att_grade_effect`.`count` <= numbers.number THEN CONCAT( - LPAD(`att_grade_effect`.`count`, 10, '0'), - '|', - `att_grade_effect`.`effect` - ) - ELSE NULL - END - ), - '|', - -1 - ), - '0' - ) AS SIGNED - ) + 0 AS `effect` -FROM `numbers` `numbers` - LEFT JOIN `users` `users` ON 1 = 1 - LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` -GROUP BY `users`.`id`, - numbers.number -ORDER BY `users`.`id` ASC, - numbers.number ASC; - --- View: teacher_lesson_report_status -CREATE OR REPLACE VIEW `teacher_lesson_report_status` AS -SELECT `teachers`.`id` AS `teacherId`, - `lessons`.`id` AS `lessonId`, - `lessons`.`year` AS `year`, - `lessons`.`name` AS `lessonName`, - `report_months`.`id` AS `reportMonthId`, - `teachers`.`user_id` AS `userId`, - CASE - WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 - ELSE 0 - END AS `isReported` -FROM `teachers` `teachers` - INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` - LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` - AND `report_months`.`year` = `lessons`.`year` - LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` - AND `att_reports`.`lessonReferenceId` = `lessons`.`id` - AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` -WHERE COALESCE( - `lessons`.`start_date`, - `report_months`.`endDate` - ) <= `report_months`.`endDate` - AND COALESCE( - `lessons`.`end_date`, - `report_months`.`startDate` - ) >= `report_months`.`startDate` -GROUP BY `teachers`.`id`, - `lessons`.`id`, - `report_months`.`id` -ORDER BY `report_months`.`id` ASC; - --- View: teacher_report_status -CREATE OR REPLACE VIEW teacher_report_status AS -SELECT - CONCAT(COALESCE(tlrs.userId, 'null'), '_', COALESCE(tlrs.teacherId, 'null'), '_', - COALESCE(tlrs.reportMonthId, 'null'), '_', COALESCE(tlrs.year, 'null')) AS id, - tlrs.userId, - tlrs.teacherId, - t.name AS teacherName, - t.comment AS teacherComment, - tlrs.reportMonthId, - tlrs.year, - rm.name AS reportMonthName, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS reportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS notReportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS reportedLessonNames, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS notReportedLessonNames -FROM teacher_lesson_report_status tlrs -LEFT JOIN teachers t ON tlrs.teacherId = t.id -LEFT JOIN report_month rm ON tlrs.reportMonthId = rm.id -GROUP BY tlrs.userId, tlrs.teacherId, tlrs.reportMonthId, tlrs.year -ORDER BY tlrs.reportMonthId, tlrs.teacherId; - --- View: teacher_lesson_grade_report_status -CREATE OR REPLACE VIEW `teacher_lesson_grade_report_status` AS -SELECT `teachers`.`id` AS `teacherId`, - `lessons`.`id` AS `lessonId`, - `lessons`.`year` AS `year`, - `lessons`.`name` AS `lessonName`, - `report_months`.`id` AS `reportMonthId`, - `teachers`.`user_id` AS `userId`, - CASE - WHEN COUNT(`grades`.`id`) > 0 THEN 1 - ELSE 0 - END AS `isReported` -FROM `teachers` `teachers` - INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` - LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` - LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` - AND `grades`.`lessonReferenceId` = `lessons`.`id` - AND `grades`.`reportMonthReferenceId` = `report_months`.`id` -WHERE COALESCE( - `lessons`.`start_date`, - `report_months`.`endDate` - ) <= `report_months`.`endDate` - AND COALESCE( - `lessons`.`end_date`, - `report_months`.`startDate` - ) >= `report_months`.`startDate` -GROUP BY `teachers`.`id`, - `lessons`.`id`, - `report_months`.`id` -ORDER BY `report_months`.`id` ASC; - --- View: teacher_grade_report_status -CREATE OR REPLACE VIEW teacher_grade_report_status AS -SELECT - CONCAT(COALESCE(tlgrs.userId, 'null'), '_', COALESCE(tlgrs.teacherId, 'null'), '_', - COALESCE(tlgrs.reportMonthId, 'null'), '_', COALESCE(tlgrs.year, 'null')) AS id, - tlgrs.userId, - tlgrs.teacherId, - t.name AS teacherName, - t.comment AS teacherComment, - tlgrs.reportMonthId, - tlgrs.year, - rm.name AS reportMonthName, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS reportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS notReportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS reportedLessonNames, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS notReportedLessonNames -FROM teacher_lesson_grade_report_status tlgrs -LEFT JOIN teachers t ON tlgrs.teacherId = t.id -LEFT JOIN report_month rm ON tlgrs.reportMonthId = rm.id -GROUP BY tlgrs.userId, tlgrs.teacherId, tlgrs.reportMonthId, tlgrs.year -ORDER BY tlgrs.reportMonthId, tlgrs.teacherId; - --- View: teacher_salary_report -CREATE OR REPLACE VIEW `teacher_salary_report` AS -SELECT DISTINCT `att_reports`.`year` AS `year`, - `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, - `att_reports`.`klassReferenceId` AS `klassReferenceId`, - `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, - `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, - CONCAT( - COALESCE(`att_reports`.`user_id`, "null"), - "_", - COALESCE(`att_reports`.`teacherReferenceId`, "null"), - "_", - COALESCE(`att_reports`.`lessonReferenceId`, "null"), - "_", - COALESCE(`att_reports`.`klassReferenceId`, "null"), - "_", - COALESCE(`att_reports`.`how_many_lessons`, "null"), - "_", - COALESCE(`att_reports`.`year`, "null"), - "_", - COALESCE(`att_reports`.`reportMonthReferenceId`, "null") - ) AS `id`, - `att_reports`.`user_id` AS `userId`, - `att_reports`.`how_many_lessons` AS `how_many_lessons` -FROM `att_report_with_report_month` `att_reports`; From 1bfcc5165ffa808a95664e03ff77d6f541aea502 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 15:50:51 +0000 Subject: [PATCH 06/10] Fix JSON columns, fullSuccess type, and FK constraint for TypeORM compatibility Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/data.sql b/db/data.sql index 106240cb..dd968fc2 100644 --- a/db/data.sql +++ b/db/data.sql @@ -163,9 +163,9 @@ CREATE TABLE `users` ( `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), `effective_id` int DEFAULT NULL, - `permissions` json DEFAULT NULL, - `additionalData` json DEFAULT NULL, - `userInfo` json DEFAULT NULL, + `permissions` text DEFAULT NULL, + `additionalData` text DEFAULT NULL, + `userInfo` text DEFAULT NULL, `isPaid` tinyint NOT NULL DEFAULT 0, `paymentMethod` varchar(255) DEFAULT NULL, `mailAddressAlias` varchar(255) DEFAULT NULL, @@ -708,7 +708,7 @@ CREATE TABLE `report_group_sessions` ( KEY `report_group_sessions_user_id_idx` (`userId`), KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), KEY `report_group_sessions_session_date_idx` (`sessionDate`), - CONSTRAINT `FK_report_group_sessions_reportGroupId` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups` (`id`) ON DELETE CASCADE + CONSTRAINT `FK_report_group_sessions_reportGroupId` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDate`, `startTime`, `endTime`, `topic`) VALUES From 77062595769b5f243f316a6d9d6b70b74ba473c9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 12 Jan 2026 15:56:55 +0000 Subject: [PATCH 07/10] Fix report_month date columns to use datetime type Co-authored-by: buzz-code <72219643+buzz-code@users.noreply.github.com> --- db/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/data.sql b/db/data.sql index dd968fc2..b24b1789 100644 --- a/db/data.sql +++ b/db/data.sql @@ -576,8 +576,8 @@ CREATE TABLE `report_month` ( `id` int NOT NULL AUTO_INCREMENT, `userId` int NOT NULL, `name` varchar(255) NOT NULL, - `startDate` date NOT NULL, - `endDate` date NOT NULL, + `startDate` datetime NOT NULL, + `endDate` datetime NOT NULL, `semester` varchar(255) NOT NULL DEFAULT 'שנתי', `year` int DEFAULT NULL, From 639d9eef95262da10e9bc8eb72721e54e826233a Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Mon, 12 Jan 2026 16:45:57 +0000 Subject: [PATCH 08/10] Add sync script for database initialization from data.sql --- db/data.sql | 35 ++++++++++++------ server/helpers/sync-db-from-data-sql.sh | 49 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 12 deletions(-) create mode 100755 server/helpers/sync-db-from-data-sql.sh diff --git a/db/data.sql b/db/data.sql index b24b1789..69bfa74d 100644 --- a/db/data.sql +++ b/db/data.sql @@ -160,8 +160,8 @@ CREATE TABLE `users` ( `password` varchar(500) DEFAULT NULL, `phone_number` varchar(11) DEFAULT NULL, `active` tinyint DEFAULT NULL, - `created_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), - `updated_at` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), `effective_id` int DEFAULT NULL, `permissions` text DEFAULT NULL, `additionalData` text DEFAULT NULL, @@ -206,7 +206,8 @@ CREATE TABLE `teachers` ( UNIQUE KEY `IDX_284ec0d1b23c78061dd15e5be1` (`user_id`, `tz`, `year`), KEY `teachers_users_idx` (`user_id`), KEY `teachers_user_id_phone_idx` (`user_id`, `phone`), - KEY `teachers_user_id_phone2_idx` (`user_id`, `phone2`) + KEY `teachers_user_id_phone2_idx` (`user_id`, `phone2`), + CONSTRAINT `FK_4668d4752e6766682d1be0b346f` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `teachers` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `phone2`, `email`, `displayName`) VALUES @@ -240,7 +241,8 @@ CREATE TABLE `students` ( `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), UNIQUE KEY `IDX_53f436b35b00a4bcb00bfa08ce` (`user_id`, `tz`, `year`), - KEY `students_users_idx` (`user_id`) + KEY `students_users_idx` (`user_id`), + CONSTRAINT `FK_fb3eff90b11bddf7285f9b4e281` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `students` (`id`, `user_id`, `year`, `tz`, `name`, `phone`, `address`, `is_active`) VALUES @@ -277,7 +279,8 @@ CREATE TABLE `klass_types` ( `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), KEY `klass_types_users_idx` (`user_id`), - KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`) + KEY `klass_types_klassTypeEnum_idx` (`klassTypeEnum`), + CONSTRAINT `FK_27aa97c80688bcf930b80450441` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `klass_types` (`id`, `user_id`, `key`, `name`, `klassTypeEnum`, `teacher_id`, `teacherReferenceId`) VALUES @@ -452,7 +455,8 @@ CREATE TABLE `att_reports` ( KEY `att_reports_klass_reference_id_idx` (`klassReferenceId`), KEY `att_reports_lesson_reference_id_idx` (`lessonReferenceId`), KEY `att_reports_report_date_idx` (`report_date`), - KEY `att_reports_report_group_session_id_idx` (`reportGroupSessionId`) + KEY `att_reports_report_group_session_id_idx` (`reportGroupSessionId`), + CONSTRAINT `FK_88c1147de5df0c80cce823ebdb8` FOREIGN KEY (`reportGroupSessionId`) REFERENCES `report_group_sessions`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `att_reports` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `abs_count`, `approved_abs_count`) VALUES @@ -505,7 +509,9 @@ CREATE TABLE `grades` ( KEY `grades_klass_reference_id_idx` (`klassReferenceId`), KEY `grades_lesson_reference_id_idx` (`lessonReferenceId`), KEY `grades_report_date_idx` (`report_date`), - KEY `grades_report_group_session_id_idx` (`reportGroupSessionId`) + KEY `grades_report_group_session_id_idx` (`reportGroupSessionId`), + CONSTRAINT `FK_da6dfe11ce2f692024f0c3d94ef` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `FK_5c91c58f91111e08ec84f6eab68` FOREIGN KEY (`reportGroupSessionId`) REFERENCES `report_group_sessions`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `grades` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `teacher_id`, `teacherReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `how_many_lessons`, `grade`, `estimation`) VALUES @@ -552,7 +558,8 @@ CREATE TABLE `known_absences` ( PRIMARY KEY (`id`), KEY `known_users_idx` (`user_id`), KEY `IDX_f2e0b7295d97b24618d46079c1` (`studentReferenceId`, `year`), - KEY `known_absences_student_reference_id_idx` (`studentReferenceId`) + KEY `known_absences_student_reference_id_idx` (`studentReferenceId`), + CONSTRAINT `FK_8e796d3aaf500d345e13654d08b` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `known_absences` (`id`, `user_id`, `year`, `student_tz`, `studentReferenceId`, `klass_id`, `klassReferenceId`, `lesson_id`, `lessonReferenceId`, `report_date`, `absnce_count`, `absnce_code`, `sender_name`, `reason`, `isApproved`) VALUES @@ -680,7 +687,10 @@ CREATE TABLE `report_groups` ( KEY `report_groups_user_id_year_idx` (`user_id`, `year`), KEY `report_groups_teacher_reference_id_idx` (`teacherReferenceId`), KEY `report_groups_lesson_reference_id_idx` (`lessonReferenceId`), - KEY `report_groups_klass_reference_id_idx` (`klassReferenceId`) + KEY `report_groups_klass_reference_id_idx` (`klassReferenceId`), + CONSTRAINT `FK_579303ddfd4db8a8ef18c204a7d` FOREIGN KEY (`teacherReferenceId`) REFERENCES `teachers`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `FK_bab150da3f43312d8f5c79c969f` FOREIGN KEY (`lessonReferenceId`) REFERENCES `lessons`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `FK_772594ba35c0745b0c5a84650a4` FOREIGN KEY (`klassReferenceId`) REFERENCES `klasses`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `report_groups` (`id`, `user_id`, `name`, `topic`, `teacherReferenceId`, `lessonReferenceId`, `klassReferenceId`, `year`) VALUES @@ -708,7 +718,7 @@ CREATE TABLE `report_group_sessions` ( KEY `report_group_sessions_user_id_idx` (`userId`), KEY `report_group_sessions_report_group_id_idx` (`reportGroupId`), KEY `report_group_sessions_session_date_idx` (`sessionDate`), - CONSTRAINT `FK_report_group_sessions_reportGroupId` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION + CONSTRAINT `FK_54fa521a3b90bf74266907b95f1` FOREIGN KEY (`reportGroupId`) REFERENCES `report_groups`(`id`) ON DELETE CASCADE ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDate`, `startTime`, `endTime`, `topic`) VALUES @@ -838,7 +848,8 @@ CREATE TABLE `yemot_call` ( `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY (`id`), - KEY `yemot_call_api_call_id_idx` (`apiCallId`) + KEY `yemot_call_api_call_id_idx` (`apiCallId`), + CONSTRAINT `FK_2f2c39a9491ac1a6e2d7827bb53` FOREIGN KEY (`userId`) REFERENCES `users`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- ============================================================ @@ -942,7 +953,7 @@ CREATE TABLE `import_file` ( `fileSource` varchar(255) NOT NULL, `entityIds` text NOT NULL, `entityName` varchar(255) NOT NULL, - `fullSuccess` tinyint(1) DEFAULT NULL, + `fullSuccess` tinyint NULL, `response` varchar(255) NOT NULL, `metadata` json DEFAULT NULL, `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), diff --git a/server/helpers/sync-db-from-data-sql.sh b/server/helpers/sync-db-from-data-sql.sh new file mode 100755 index 00000000..df2f13b4 --- /dev/null +++ b/server/helpers/sync-db-from-data-sql.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Script to sync database with data.sql file +# This rebuilds the database from data.sql to ensure schema is in sync + +set -e + +echo "🔄 Syncing database from data.sql..." + +# Check if docker compose is running +if ! docker compose ps mysql | grep -q "Up"; then + echo "❌ Database container is not running. Please start it with: docker compose up -d mysql" + exit 1 +fi + +# Wait for MySQL to be ready +echo "⏳ Waiting for MySQL to be ready..." +timeout=30 +counter=0 +until docker compose exec mysql mysqladmin ping -h localhost --silent 2>/dev/null; do + sleep 1 + counter=$((counter + 1)) + if [ $counter -ge $timeout ]; then + echo "❌ Timeout waiting for MySQL to be ready" + exit 1 + fi +done + +echo "✅ MySQL is ready" + +# Get database credentials from environment or use defaults +DB_NAME=${MYSQL_DATABASE:-mysql_database} +DB_USER=${MYSQL_USER:-mysql_user} +DB_PASSWORD=${MYSQL_PASSWORD:-mysql_password} + +# Drop and recreate database +echo "🗑️ Dropping existing database..." +docker compose exec mysql mysql -u"$DB_USER" -p"$DB_PASSWORD" -e "DROP DATABASE IF EXISTS \`$DB_NAME\`;" + +echo "📦 Creating fresh database..." +docker compose exec mysql mysql -u"$DB_USER" -p"$DB_PASSWORD" -e "CREATE DATABASE \`$DB_NAME\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" + +# Import data.sql +echo "📥 Importing data.sql..." +docker compose exec -T mysql mysql -u"$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" < db/data.sql + +echo "✅ Database synced successfully!" +echo "" +echo "💡 You can now run: docker compose exec backend yarn typeorm:generate src/migrations/migrationMeaningfulName -p --dr" From f08b17644dcfcb1f4c8b99d35eaac234ed67954a Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Mon, 12 Jan 2026 17:08:06 +0000 Subject: [PATCH 09/10] Implement code changes to enhance functionality and improve performance --- db/data.sql | 884 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 568 insertions(+), 316 deletions(-) diff --git a/db/data.sql b/db/data.sql index 69bfa74d..fc2200b2 100644 --- a/db/data.sql +++ b/db/data.sql @@ -746,43 +746,8 @@ CREATE TABLE `typeorm_metadata` ( `value` text ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -INSERT INTO `typeorm_metadata` (`type`, `schema`, `table`, `name`, `value`) VALUES -('GENERATED_COLUMN', 'mysql_database', 'lessons', 'klass_reference_ids_json', 'CAST(CONCAT(''['', COALESCE(klassReferenceIds, ''''), '']'') AS JSON)'); - SET FOREIGN_KEY_CHECKS = 1; --- ============================================================ --- Views --- Critical view entities required by the application --- ============================================================ - --- View: student_base_klass -CREATE OR REPLACE VIEW `student_base_klass` AS -SELECT - `student_klasses`.`studentReferenceId` AS `id`, - `student_klasses`.`user_id` AS `user_id`, - `student_klasses`.`year` AS `year`, - GROUP_CONCAT(DISTINCT IF(`klass_types`.`klassTypeEnum` = 'כיתת אם', `klasses`.`name`, NULL) SEPARATOR ', ') AS `base_klass` -FROM `student_klasses` -LEFT JOIN `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` -LEFT JOIN `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` -GROUP BY `studentReferenceId`, `user_id`, `year`; - --- View: lesson_klass_name -CREATE OR REPLACE VIEW `lesson_klass_name` AS -SELECT lessons.id AS id, - lessons.user_id AS user_id, - GROUP_CONCAT(DISTINCT klasses.name SEPARATOR ', ') AS name -FROM lessons - LEFT JOIN JSON_TABLE( - lessons.klass_reference_ids_json, - "$[*]" COLUMNS(klass_id INT PATH "$") - ) AS jt ON 1 = 1 - LEFT JOIN klasses ON klasses.id = jt.klass_id -GROUP BY lessons.id, - lessons.user_id; - - -- ============================================================ -- Table: texts -- Text content management @@ -1009,14 +974,160 @@ INSERT INTO `numbers` (`id`, `number`) VALUES (101, '0'); -- ============================================================ --- Additional Views - All TypeORM View Entities +-- Views +-- Critical view entities required by the application -- ============================================================ --- View: att_report_and_grade -CREATE OR REPLACE VIEW `att_report_and_grade` AS -SELECT - CONCAT('a-', id) AS id, - 'att' as `type`, +CREATE VIEW `text_by_user` AS +SELECT `t_base`.`name` AS `name`, + `t_base`.`description` AS `description`, + `users`.`id` AS `userId`, + `t_user`.`id` AS `overrideTextId`, + CONCAT(`users`.`id`, "_", `t_base`.`id`) AS `id`, + COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, + COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` +FROM `texts` `t_base` + LEFT JOIN `users` `users` ON `users`.`effective_id` is null + LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` + AND `t_user`.`user_id` = `users`.`id` +WHERE `t_base`.`user_id` = 0 +ORDER BY `users`.`id` ASC, + `t_base`.`id` ASC; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'text_by_user', 'SELECT `t_base`.`name` AS `name`, `t_base`.`description` AS `description`, `users`.`id` AS `userId`, `t_user`.`id` AS `overrideTextId`, CONCAT(`users`.`id`, \"_\", `t_base`.`id`) AS `id`, COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` FROM `texts` `t_base` LEFT JOIN `users` `users` ON `users`.`effective_id` is null LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` AND `t_user`.`user_id` = `users`.`id` WHERE `t_base`.`user_id` = 0 ORDER BY `users`.`id` ASC, `t_base`.`id` ASC'); + + +CREATE VIEW `lesson_klass_name` AS +SELECT lessons.id AS id, + lessons.user_id AS user_id, + GROUP_CONCAT(DISTINCT klasses.name SEPARATOR ', ') AS name +FROM lessons + LEFT JOIN JSON_TABLE( + lessons.klass_reference_ids_json, + "$[*]" COLUMNS(klass_id INT PATH "$") + ) AS jt ON 1 = 1 + LEFT JOIN klasses ON klasses.id = jt.klass_id +GROUP BY lessons.id, + lessons.user_id; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'lesson_klass_name', 'SELECT lessons.id AS id,\n lessons.user_id AS user_id,\n GROUP_CONCAT(DISTINCT klasses.name SEPARATOR \', \') AS name\n FROM lessons\n LEFT JOIN JSON_TABLE(\n lessons.klass_reference_ids_json,\n \"$[*]\" COLUMNS(klass_id INT PATH \"$\")\n ) AS jt ON 1=1\n LEFT JOIN klasses ON klasses.id = jt.klass_id\n GROUP BY lessons.id, lessons.user_id'); + + +CREATE VIEW `student_by_year` AS +SELECT `students`.`id` AS `id`, + `students`.`tz` AS `tz`, + `students`.`name` AS `name`, + `students`.`is_active` AS `isActive`, + `students`.`user_id` AS `user_id`, + GROUP_CONCAT(DISTINCT `student_klasses`.`year`) AS `year`, + GROUP_CONCAT(DISTINCT `student_klasses`.`klassReferenceId`) AS `klassReferenceIds`, + GROUP_CONCAT(DISTINCT `klasses`.`klassTypeReferenceId`) AS `klassTypeReferenceIds` +FROM `student_klasses` `student_klasses` + LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` + LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` +GROUP BY `students`.`id`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_by_year', 'SELECT `students`.`id` AS `id`, `students`.`tz` AS `tz`, `students`.`name` AS `name`, `students`.`is_active` AS `isActive`, `students`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT `student_klasses`.`year`) AS `year`, GROUP_CONCAT(DISTINCT `student_klasses`.`klassReferenceId`) AS `klassReferenceIds`, GROUP_CONCAT(DISTINCT `klasses`.`klassTypeReferenceId`) AS `klassTypeReferenceIds` FROM `student_klasses` `student_klasses` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` GROUP BY `students`.`id`'); + + +CREATE VIEW `student_base_klass` AS +SELECT `student_klasses`.`year` AS `year`, + studentReferenceId AS `id`, + `student_klasses`.`user_id` AS `user_id`, + GROUP_CONCAT( + DISTINCT if( + `klass_types`.`klassTypeEnum` = 'כיתת אם', + `klasses`.`name`, + null + ) SEPARATOR ', ' + ) AS `base_klass` +FROM `student_klasses` `student_klasses` + LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` + LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` +GROUP BY studentReferenceId, + user_id, + year; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_base_klass', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); + + +CREATE VIEW `abs_count_effect_by_user` AS +SELECT `users`.`id` AS `userId`, + CONCAT(`users`.`id`, "_", numbers.number) AS `id`, + numbers.number AS `number`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE + WHEN `att_grade_effect`.`count` <= numbers.number THEN CONCAT( + LPAD(`att_grade_effect`.`count`, 10, '0'), + '|', + `att_grade_effect`.`effect` + ) + ELSE NULL + END + ), + '|', + -1 + ), + '0' + ) AS SIGNED + ) + 0 AS `effect` +FROM `numbers` `numbers` + LEFT JOIN `users` `users` ON 1 = 1 + LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` +GROUP BY `users`.`id`, + numbers.number +ORDER BY `users`.`id` ASC, + numbers.number ASC; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'abs_count_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`count`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); + + +CREATE VIEW `att_report_and_grade` AS +SELECT CONCAT('a-', id) AS id, + 'att' as 'type', user_id, `year`, studentReferenceId, @@ -1027,15 +1138,14 @@ SELECT how_many_lessons, abs_count, approved_abs_count, - NULL AS grade, - NULL AS estimation, + NULL AS 'grade', + NULL AS 'estimation', comments, sheet_name FROM att_reports UNION -SELECT - CONCAT('g-', id) AS id, - 'grade' as `type`, +SELECT CONCAT('g-', id) AS id, + 'grade' as 'type', user_id, `year`, studentReferenceId, @@ -1044,16 +1154,125 @@ SELECT klassReferenceId, report_date, how_many_lessons, - NULL AS abs_count, - NULL AS approved_abs_count, + NULL AS 'abs_count', + NULL AS 'approved_abs_count', grade, estimation, comments, - NULL AS sheet_name + NULL AS 'sheet_name' FROM grades; --- View: student_global_report -CREATE OR REPLACE VIEW `student_global_report` AS + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'att_report_and_grade', 'SELECT\n CONCAT(\'a-\', id) AS id,\n \'att\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n abs_count,\n approved_abs_count,\n NULL AS \'grade\',\n NULL AS \'estimation\',\n comments,\n sheet_name\n FROM\n att_reports\n UNION\n SELECT\n CONCAT(\'g-\', id) AS id,\n \'grade\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n NULL AS \'abs_count\',\n NULL AS \'approved_abs_count\',\n grade,\n estimation,\n comments,\n NULL AS \'sheet_name\'\n FROM\n grades'); + + +CREATE VIEW `att_report_with_report_month` AS +SELECT `report_months`.`id` AS `reportMonthReferenceId`, + ar.* +FROM `att_reports` `ar` + LEFT JOIN `report_month` `report_months` ON `ar`.`user_id` = `report_months`.`userId` + AND `ar`.`report_date` <= `report_months`.`endDate` + AND `ar`.`report_date` >= `report_months`.`startDate`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'att_report_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, ar.* FROM `att_reports` `ar` LEFT JOIN `report_month` `report_months` ON `ar`.`user_id` = `report_months`.`userId` AND `ar`.`report_date` <= `report_months`.`endDate` AND `ar`.`report_date` >= `report_months`.`startDate`'); + + +CREATE VIEW `grade_effect_by_user` AS +SELECT `users`.`id` AS `userId`, + CONCAT(`users`.`id`, "_", numbers.number) AS `id`, + numbers.number AS `number`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE + WHEN `att_grade_effect`.`percents` <= numbers.number THEN CONCAT( + LPAD(`att_grade_effect`.`percents`, 10, '0'), + '|', + `att_grade_effect`.`effect` + ) + ELSE NULL + END + ), + '|', + -1 + ), + '0' + ) AS SIGNED + ) + 0 AS `effect` +FROM `numbers` `numbers` + LEFT JOIN `users` `users` ON 1 = 1 + LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` +GROUP BY `users`.`id`, + numbers.number +ORDER BY `users`.`id` ASC, + numbers.number ASC; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'grade_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`percents`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); + + +CREATE VIEW `grade_with_report_month` AS +SELECT `report_months`.`id` AS `reportMonthReferenceId`, + grades.* +FROM `grades` `grades` + LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` + AND `grades`.`report_date` <= `report_months`.`endDate` + AND `grades`.`report_date` >= `report_months`.`startDate`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'grade_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, grades.* FROM `grades` `grades` LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` AND `grades`.`report_date` <= `report_months`.`endDate` AND `grades`.`report_date` >= `report_months`.`startDate`'); + + +CREATE VIEW `known_absence_with_report_month` AS +SELECT `report_months`.`id` AS `reportMonthReferenceId`, + known_absences.* +FROM `known_absences` `known_absences` + LEFT JOIN `report_month` `report_months` ON `known_absences`.`user_id` = `report_months`.`userId` + AND `known_absences`.`report_date` <= `report_months`.`endDate` + AND `known_absences`.`report_date` >= `report_months`.`startDate`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'known_absence_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, known_absences.* FROM `known_absences` `known_absences` LEFT JOIN `report_month` `report_months` ON `known_absences`.`user_id` = `report_months`.`userId` AND `known_absences`.`report_date` <= `report_months`.`endDate` AND `known_absences`.`report_date` >= `report_months`.`startDate`'); + + +CREATE VIEW `student_global_report` AS SELECT `atag`.`year` AS `year`, `atag`.`teacherReferenceId` AS `teacherReferenceId`, CONCAT( @@ -1090,108 +1309,100 @@ GROUP BY studentReferenceId, `atag`.`user_id`, `atag`.`year`; --- View: student_speciality -CREATE OR REPLACE VIEW `student_speciality` AS -SELECT - student_klasses.studentReferenceId AS id, - student_klasses.user_id, - student_klasses.year, - GROUP_CONCAT(DISTINCT IF(klass_types.klassTypeEnum = 'התמחות', klasses.name, NULL) SEPARATOR ', ') AS base_klass -FROM student_klasses -LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId -LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId -GROUP BY studentReferenceId, user_id, year; - --- View: student_by_year -CREATE OR REPLACE VIEW `student_by_year` AS -SELECT - students.id, - students.user_id, - students.tz, - students.name, - students.is_active AS isActive, - GROUP_CONCAT(DISTINCT student_klasses.year) AS year, - GROUP_CONCAT(DISTINCT student_klasses.klassReferenceId) AS klassReferenceIds, - GROUP_CONCAT(DISTINCT klasses.klassTypeReferenceId) AS klassTypeReferenceIds -FROM student_klasses -LEFT JOIN students ON students.id = student_klasses.studentReferenceId -LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId -GROUP BY students.id; - --- View: student_klasses_report -CREATE OR REPLACE VIEW student_klasses_report AS -SELECT student_klasses.year AS year, - students.id AS id, - students.id AS student_reference_id, - students.tz AS student_tz, - students.name AS student_name, - student_klasses.user_id AS user_id, + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_global_report', 'SELECT `atag`.`year` AS `year`, `atag`.`teacherReferenceId` AS `teacherReferenceId`, CONCAT(COALESCE(studentReferenceId, \"null\"), \"_\", COALESCE(`atag`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(klassReferenceId, \"null\"), \"_\", COALESCE(lessonReferenceId, \"null\"), \"_\", COALESCE(`atag`.`user_id`, \"null\"), \"_\", COALESCE(`atag`.`year`, \"null\")) AS `id`, `atag`.`user_id` AS `user_id`, studentReferenceId, klassReferenceId, lessonReferenceId, CASE WHEN `klass_types`.`klassTypeEnum` = \"כיתת אם\" THEN 1 ELSE 0 END AS `isBaseKlass`, SUM(how_many_lessons) AS `lessons_count`, SUM(abs_count) AS `abs_count`, AVG(grade) AS `grade_avg` FROM `att_report_and_grade` `atag` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `atag`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, `atag`.`teacherReferenceId`, klassReferenceId, lessonReferenceId, `atag`.`user_id`, `atag`.`year`'); + + +CREATE VIEW `student_klasses_report` AS +SELECT `student_klasses`.`year` AS `year`, + `students`.`id` AS `id`, + `students`.`id` AS `student_reference_id`, + `students`.`tz` AS `student_tz`, + `students`.`name` AS `student_name`, + `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'כיתת אם', - student_klasses.klassReferenceId, - NULL + if( + `klass_types`.`klassTypeEnum` = 'כיתת אם', + `student_klasses`.`klassReferenceId`, + null ) SEPARATOR ',' - ) AS klassReferenceId_1, + ) AS `klassReferenceId_1`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'מסלול', - student_klasses.klassReferenceId, - NULL + if( + `klass_types`.`klassTypeEnum` = 'מסלול', + `student_klasses`.`klassReferenceId`, + null ) SEPARATOR ',' - ) AS klassReferenceId_2, + ) AS `klassReferenceId_2`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'התמחות', - student_klasses.klassReferenceId, - NULL + if( + `klass_types`.`klassTypeEnum` = 'התמחות', + `student_klasses`.`klassReferenceId`, + null ) SEPARATOR ',' - ) AS klassReferenceId_3, + ) AS `klassReferenceId_3`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, - student_klasses.klassReferenceId, - NULL + if( + `klass_types`.`klassTypeEnum` = 'אחר' || `klass_types`.`klassTypeEnum` is null, + `student_klasses`.`klassReferenceId`, + null ) SEPARATOR ',' - ) AS klassReferenceId_null, + ) AS `klassReferenceId_null`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'כיתת אם', - klasses.name, - NULL + if( + `klass_types`.`klassTypeEnum` = 'כיתת אם', + `klasses`.`name`, + null ) SEPARATOR ', ' - ) AS klass_name_1, + ) AS `klass_name_1`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'מסלול', - klasses.name, - NULL + if( + `klass_types`.`klassTypeEnum` = 'מסלול', + `klasses`.`name`, + null ) SEPARATOR ', ' - ) AS klass_name_2, + ) AS `klass_name_2`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'התמחות', - klasses.name, - NULL + if( + `klass_types`.`klassTypeEnum` = 'התמחות', + `klasses`.`name`, + null ) SEPARATOR ', ' - ) AS klass_name_3, + ) AS `klass_name_3`, GROUP_CONCAT( - IF( - klass_types.klassTypeEnum = 'אחר' OR klass_types.klassTypeEnum IS NULL, - klasses.name, - NULL + if( + `klass_types`.`klassTypeEnum` = 'אחר' || `klass_types`.`klassTypeEnum` is null, + `klasses`.`name`, + null ) SEPARATOR ', ' - ) AS klass_name_null -FROM student_klasses - LEFT JOIN klasses ON klasses.id = student_klasses.klassReferenceId - LEFT JOIN klass_types ON klass_types.id = klasses.klassTypeReferenceId - LEFT JOIN students ON students.id = student_klasses.studentReferenceId -GROUP BY students.id, - student_klasses.user_id, - student_klasses.year; - --- View: student_percent_report -CREATE OR REPLACE VIEW `student_percent_report` AS + ) AS `klass_name_null` +FROM `student_klasses` `student_klasses` + LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` + LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` + LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` +GROUP BY `students`.`id`, + `student_klasses`.`user_id`, + `student_klasses`.`year`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_klasses_report', 'SELECT `student_klasses`.`year` AS `year`, `students`.`id` AS `id`, `students`.`id` AS `student_reference_id`, `students`.`tz` AS `student_tz`, `students`.`name` AS `student_name`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_null`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_null` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` GROUP BY `students`.`id`, `student_klasses`.`user_id`, `student_klasses`.`year`'); + + +CREATE VIEW `student_percent_report` AS SELECT id, user_id, year, @@ -1208,116 +1419,47 @@ SELECT id, grade_avg / 100 AS `grade_avg` FROM `student_global_report` `sgr`; --- View: text_by_user -CREATE OR REPLACE VIEW `text_by_user` AS -SELECT `t_base`.`name` AS `name`, - `t_base`.`description` AS `description`, - `users`.`id` AS `userId`, - `t_user`.`id` AS `overrideTextId`, - CONCAT(`users`.`id`, "_", `t_base`.`id`) AS `id`, - COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, - COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` -FROM `texts` `t_base` - LEFT JOIN `users` `users` ON `users`.`effective_id` is null - LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` - AND `t_user`.`user_id` = `users`.`id` -WHERE `t_base`.`user_id` = 0 -ORDER BY `users`.`id` ASC, - `t_base`.`id` ASC; --- View: att_report_with_report_month -CREATE OR REPLACE VIEW att_report_with_report_month AS -SELECT report_months.id AS reportMonthReferenceId, - att_reports.* -FROM att_reports - LEFT JOIN report_month report_months ON att_reports.user_id = report_months.userId - AND att_reports.report_date <= report_months.endDate - AND att_reports.report_date >= report_months.startDate; +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_percent_report', 'SELECT id, user_id, year, studentReferenceId, teacherReferenceId, klassReferenceId, lessonReferenceId, lessons_count, abs_count, COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) AS `abs_percents`, (1 - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1)) AS `att_percents`, grade_avg / 100 AS `grade_avg` FROM `student_global_report` `sgr`'); --- View: grade_with_report_month -CREATE OR REPLACE VIEW `grade_with_report_month` AS -SELECT `report_months`.`id` AS `reportMonthReferenceId`, - grades.* -FROM `grades` `grades` - LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` - AND `grades`.`report_date` <= `report_months`.`endDate` - AND `grades`.`report_date` >= `report_months`.`startDate`; --- View: known_absence_with_report_month -CREATE OR REPLACE VIEW known_absence_with_report_month AS -SELECT report_months.id AS reportMonthReferenceId, - known_absences.* -FROM known_absences - LEFT JOIN report_month report_months ON known_absences.user_id = report_months.userId - AND known_absences.report_date <= report_months.endDate - AND known_absences.report_date >= report_months.startDate; +CREATE VIEW `student_speciality` AS +SELECT `student_klasses`.`year` AS `year`, + studentReferenceId AS `id`, + `student_klasses`.`user_id` AS `user_id`, + GROUP_CONCAT( + DISTINCT if( + `klass_types`.`klassTypeEnum` = 'התמחות', + `klasses`.`name`, + null + ) SEPARATOR ', ' + ) AS `base_klass` +FROM `student_klasses` `student_klasses` + LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` + LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` +GROUP BY studentReferenceId, + user_id, + year; --- View: grade_effect_by_user -CREATE OR REPLACE VIEW `grade_effect_by_user` AS -SELECT `users`.`id` AS `userId`, - CONCAT(`users`.`id`, "_", numbers.number) AS `id`, - numbers.number AS `number`, - CAST( - COALESCE( - SUBSTRING_INDEX( - MAX( - CASE - WHEN `att_grade_effect`.`percents` <= numbers.number THEN CONCAT( - LPAD(`att_grade_effect`.`percents`, 10, '0'), - '|', - `att_grade_effect`.`effect` - ) - ELSE NULL - END - ), - '|', - -1 - ), - '0' - ) AS SIGNED - ) + 0 AS `effect` -FROM `numbers` `numbers` - LEFT JOIN `users` `users` ON 1 = 1 - LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` -GROUP BY `users`.`id`, - numbers.number -ORDER BY `users`.`id` ASC, - numbers.number ASC; --- View: abs_count_effect_by_user -CREATE OR REPLACE VIEW `abs_count_effect_by_user` AS -SELECT `users`.`id` AS `userId`, - CONCAT(`users`.`id`, "_", numbers.number) AS `id`, - numbers.number AS `number`, - CAST( - COALESCE( - SUBSTRING_INDEX( - MAX( - CASE - WHEN `att_grade_effect`.`count` <= numbers.number THEN CONCAT( - LPAD(`att_grade_effect`.`count`, 10, '0'), - '|', - `att_grade_effect`.`effect` - ) - ELSE NULL - END - ), - '|', - -1 - ), - '0' - ) AS SIGNED - ) + 0 AS `effect` -FROM `numbers` `numbers` - LEFT JOIN `users` `users` ON 1 = 1 - LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` -GROUP BY `users`.`id`, - numbers.number -ORDER BY `users`.`id` ASC, - numbers.number ASC; +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_speciality', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); + --- View: teacher_lesson_report_status -CREATE OR REPLACE VIEW `teacher_lesson_report_status` AS +CREATE VIEW `teacher_lesson_grade_report_status` AS SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, @@ -1325,16 +1467,15 @@ SELECT `teachers`.`id` AS `teacherId`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE - WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 + WHEN COUNT(`grades`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` - AND `report_months`.`year` = `lessons`.`year` - LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` - AND `att_reports`.`lessonReferenceId` = `lessons`.`id` - AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` + LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` + AND `grades`.`lessonReferenceId` = `lessons`.`id` + AND `grades`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE( `lessons`.`start_date`, `report_months`.`endDate` @@ -1348,30 +1489,116 @@ GROUP BY `teachers`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC; --- View: teacher_report_status -CREATE OR REPLACE VIEW teacher_report_status AS -SELECT - CONCAT(COALESCE(tlrs.userId, 'null'), '_', COALESCE(tlrs.teacherId, 'null'), '_', - COALESCE(tlrs.reportMonthId, 'null'), '_', COALESCE(tlrs.year, 'null')) AS id, - tlrs.userId, - tlrs.teacherId, - t.name AS teacherName, - t.comment AS teacherComment, - tlrs.reportMonthId, - tlrs.year, - rm.name AS reportMonthName, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS reportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonId END ORDER BY tlrs.lessonName) AS notReportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 1 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS reportedLessonNames, - GROUP_CONCAT(DISTINCT CASE WHEN tlrs.isReported = 0 THEN tlrs.lessonName END ORDER BY tlrs.lessonName SEPARATOR ', ') AS notReportedLessonNames -FROM teacher_lesson_report_status tlrs -LEFT JOIN teachers t ON tlrs.teacherId = t.id -LEFT JOIN report_month rm ON tlrs.reportMonthId = rm.id -GROUP BY tlrs.userId, tlrs.teacherId, tlrs.reportMonthId, tlrs.year -ORDER BY tlrs.reportMonthId, tlrs.teacherId; - --- View: teacher_lesson_grade_report_status -CREATE OR REPLACE VIEW `teacher_lesson_grade_report_status` AS + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_lesson_grade_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`grades`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` AND `grades`.`lessonReferenceId` = `lessons`.`id` AND `grades`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); + + +CREATE VIEW `teacher_grade_report_status` AS +SELECT `tlrs`.`userId` AS `userId`, + `tlrs`.`year` AS `year`, + `tlrs`.`teacherId` AS `teacherId`, + `tlrs`.`reportMonthId` AS `reportMonthId`, + `teacher`.`name` AS `teacherName`, + `teacher`.`comment` AS `teacherComment`, + `rm`.`name` AS `reportMonthName`, + CONCAT( + COALESCE(`tlrs`.`userId`, "null"), + "_", + COALESCE(`tlrs`.`teacherId`, "null"), + "_", + COALESCE(`tlrs`.`reportMonthId`, "null"), + "_", + COALESCE(`tlrs`.`year`, "null") + ) AS `id`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` + END + ORDER BY `tlrs`.`lessonName` + ) AS `reportedLessons`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` + END + ORDER BY `tlrs`.`lessonName` + ) AS `notReportedLessons`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` + END + ORDER BY `tlrs`.`lessonName` SEPARATOR ", " + ) AS `reportedLessonNames`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` + END + ORDER BY `tlrs`.`lessonName` SEPARATOR ", " + ) AS `notReportedLessonNames` +FROM `teacher_lesson_grade_report_status` `tlrs` + LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` + LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` +GROUP BY `tlrs`.`userId`, + `tlrs`.`teacherId`, + `tlrs`.`reportMonthId`, + `tlrs`.`year` +ORDER BY `tlrs`.`reportMonthId` ASC, + `tlrs`.`teacherId` ASC; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_grade_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_grade_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC'); + + +CREATE VIEW `teacher_salary_report` AS +SELECT DISTINCT `att_reports`.`year` AS `year`, + `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, + `att_reports`.`klassReferenceId` AS `klassReferenceId`, + `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, + `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, + CONCAT( + COALESCE(`att_reports`.`user_id`, "null"), + "_", + COALESCE(`att_reports`.`teacherReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`lessonReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`klassReferenceId`, "null"), + "_", + COALESCE(`att_reports`.`how_many_lessons`, "null"), + "_", + COALESCE(`att_reports`.`year`, "null"), + "_", + COALESCE(`att_reports`.`reportMonthReferenceId`, "null") + ) AS `id`, + `att_reports`.`user_id` AS `userId`, + `att_reports`.`how_many_lessons` AS `how_many_lessons` +FROM `att_report_with_report_month` `att_reports`; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_salary_report', 'SELECT DISTINCT `att_reports`.`year` AS `year`, `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, `att_reports`.`klassReferenceId` AS `klassReferenceId`, `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, CONCAT(COALESCE(`att_reports`.`user_id`, \"null\"), \"_\", COALESCE(`att_reports`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`lessonReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`klassReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`how_many_lessons`, \"null\"), \"_\", COALESCE(`att_reports`.`year`, \"null\"), \"_\", COALESCE(`att_reports`.`reportMonthReferenceId`, \"null\")) AS `id`, `att_reports`.`user_id` AS `userId`, `att_reports`.`how_many_lessons` AS `how_many_lessons` FROM `att_report_with_report_month` `att_reports`'); + + +CREATE VIEW `teacher_lesson_report_status` AS SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, @@ -1379,15 +1606,16 @@ SELECT `teachers`.`id` AS `teacherId`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE - WHEN COUNT(`grades`.`id`) > 0 THEN 1 + WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` - LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` - AND `grades`.`lessonReferenceId` = `lessons`.`id` - AND `grades`.`reportMonthReferenceId` = `report_months`.`id` + AND `report_months`.`year` = `lessons`.`year` + LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` + AND `att_reports`.`lessonReferenceId` = `lessons`.`id` + AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE( `lessons`.`start_date`, `report_months`.`endDate` @@ -1401,50 +1629,74 @@ GROUP BY `teachers`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC; --- View: teacher_grade_report_status -CREATE OR REPLACE VIEW teacher_grade_report_status AS -SELECT - CONCAT(COALESCE(tlgrs.userId, 'null'), '_', COALESCE(tlgrs.teacherId, 'null'), '_', - COALESCE(tlgrs.reportMonthId, 'null'), '_', COALESCE(tlgrs.year, 'null')) AS id, - tlgrs.userId, - tlgrs.teacherId, - t.name AS teacherName, - t.comment AS teacherComment, - tlgrs.reportMonthId, - tlgrs.year, - rm.name AS reportMonthName, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS reportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonId END ORDER BY tlgrs.lessonName) AS notReportedLessons, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 1 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS reportedLessonNames, - GROUP_CONCAT(DISTINCT CASE WHEN tlgrs.isReported = 0 THEN tlgrs.lessonName END ORDER BY tlgrs.lessonName SEPARATOR ', ') AS notReportedLessonNames -FROM teacher_lesson_grade_report_status tlgrs -LEFT JOIN teachers t ON tlgrs.teacherId = t.id -LEFT JOIN report_month rm ON tlgrs.reportMonthId = rm.id -GROUP BY tlgrs.userId, tlgrs.teacherId, tlgrs.reportMonthId, tlgrs.year -ORDER BY tlgrs.reportMonthId, tlgrs.teacherId; - --- View: teacher_salary_report -CREATE OR REPLACE VIEW `teacher_salary_report` AS -SELECT DISTINCT `att_reports`.`year` AS `year`, - `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, - `att_reports`.`klassReferenceId` AS `klassReferenceId`, - `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, - `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_lesson_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` AND `report_months`.`year` = `lessons`.`year` LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` AND `att_reports`.`lessonReferenceId` = `lessons`.`id` AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); + + +CREATE VIEW `teacher_report_status` AS +SELECT `tlrs`.`userId` AS `userId`, + `tlrs`.`year` AS `year`, + `tlrs`.`teacherId` AS `teacherId`, + `tlrs`.`reportMonthId` AS `reportMonthId`, + `teacher`.`name` AS `teacherName`, + `teacher`.`comment` AS `teacherComment`, + `rm`.`name` AS `reportMonthName`, CONCAT( - COALESCE(`att_reports`.`user_id`, "null"), - "_", - COALESCE(`att_reports`.`teacherReferenceId`, "null"), - "_", - COALESCE(`att_reports`.`lessonReferenceId`, "null"), - "_", - COALESCE(`att_reports`.`klassReferenceId`, "null"), + COALESCE(`tlrs`.`userId`, "null"), "_", - COALESCE(`att_reports`.`how_many_lessons`, "null"), + COALESCE(`tlrs`.`teacherId`, "null"), "_", - COALESCE(`att_reports`.`year`, "null"), + COALESCE(`tlrs`.`reportMonthId`, "null"), "_", - COALESCE(`att_reports`.`reportMonthReferenceId`, "null") + COALESCE(`tlrs`.`year`, "null") ) AS `id`, - `att_reports`.`user_id` AS `userId`, - `att_reports`.`how_many_lessons` AS `how_many_lessons` -FROM `att_report_with_report_month` `att_reports`; + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` + END + ORDER BY `tlrs`.`lessonName` + ) AS `reportedLessons`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` + END + ORDER BY `tlrs`.`lessonName` + ) AS `notReportedLessons`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` + END + ORDER BY `tlrs`.`lessonName` SEPARATOR ", " + ) AS `reportedLessonNames`, + GROUP_CONCAT( + DISTINCT CASE + WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` + END + ORDER BY `tlrs`.`lessonName` SEPARATOR ", " + ) AS `notReportedLessonNames` +FROM `teacher_lesson_report_status` `tlrs` + LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` + LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` +GROUP BY `tlrs`.`userId`, + `tlrs`.`teacherId`, + `tlrs`.`reportMonthId`, + `tlrs`.`year` +ORDER BY `tlrs`.`reportMonthId` ASC, + `tlrs`.`teacherId` ASC; + + +INSERT INTO `typeorm_metadata`( + `schema`, + `table`, + `type`, + `name`, + `value` + ) +VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC') \ No newline at end of file From 767ccbfbc392b8f912a6dd814cb51f60263688f2 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Mon, 12 Jan 2026 19:45:10 +0000 Subject: [PATCH 10/10] Add typeorm_metadata table and update lessons table with generated column metadata - Created `typeorm_metadata` table to store metadata for generated columns and other database objects. - Updated `lessons` table to allow NULL for the `klass_reference_ids_json` generated column. - Inserted metadata entries for the `klass_reference_ids_json` generated column in the `typeorm_metadata` table. - Updated various views to include the database name in the metadata entries. --- db/data.sql | 97 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 35 deletions(-) diff --git a/db/data.sql b/db/data.sql index fc2200b2..5b5a7840 100644 --- a/db/data.sql +++ b/db/data.sql @@ -148,6 +148,20 @@ INSERT INTO `migrations` (`timestamp`, `name`) VALUES (1767647702833, 'FixDataDatesAndOverlaps1767647702833'), (1767647800000, 'FixSchemaMisalignments1767647800000'); +-- ============================================================ +-- Table: typeorm_metadata +-- TypeORM metadata for generated columns and other metadata +-- ============================================================ +DROP TABLE IF EXISTS `typeorm_metadata`; +CREATE TABLE `typeorm_metadata` ( + `database` varchar(255) DEFAULT NULL, + `type` varchar(255) NOT NULL, + `schema` varchar(255) DEFAULT NULL, + `table` varchar(255) DEFAULT NULL, + `name` varchar(255) DEFAULT NULL, + `value` text +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + -- ============================================================ -- Table: users -- Main users table @@ -347,7 +361,7 @@ CREATE TABLE `lessons` ( `display_name` varchar(500) DEFAULT NULL, `klasses` varchar(450) DEFAULT NULL, `klassReferenceIds` text, - `klass_reference_ids_json` json GENERATED ALWAYS AS (cast(concat('[',coalesce(`klassReferenceIds`,''),']') as json)) STORED, + `klass_reference_ids_json` json GENERATED ALWAYS AS (cast(concat('[',coalesce(`klassReferenceIds`,''),']') as json)) STORED NULL, `teacher_id` varchar(10) DEFAULT NULL, `teacherReferenceId` int DEFAULT NULL, `start_date` date DEFAULT NULL, @@ -364,6 +378,14 @@ CREATE TABLE `lessons` ( KEY `lessons_teacher_reference_id_idx` (`teacherReferenceId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +ALTER TABLE `lessons` CHANGE `klass_reference_ids_json` `klass_reference_ids_json` json AS ( + CAST( + CONCAT('[', COALESCE(klassReferenceIds, ''), ']') AS JSON + ) +) STORED NULL; +INSERT INTO `typeorm_metadata` (`database`, `type`, `schema`, `table`, `name`, `value`) VALUES +('mysql_database', 'GENERATED_COLUMN', 'mysql_database', 'lessons', 'klass_reference_ids_json', "CAST(CONCAT('[', COALESCE(klassReferenceIds, ''), ']') AS JSON)"); + INSERT INTO `lessons` (`id`, `user_id`, `year`, `key`, `name`, `display_name`, `klasses`, `klassReferenceIds`, `teacher_id`, `teacherReferenceId`, `start_date`, `end_date`, `how_many_lessons`, `order`) VALUES (1, 1, 5786, 1, 'Mathematics', 'Math', '1,2', '1,2', '123456789', 1, '2025-09-01', '2025-12-31', 40, 1), (2, 1, 5786, 2, 'Hebrew', 'Hebrew', '1,2,3', '1,2,3', '234567890', 2, '2025-09-01', '2025-12-31', 45, 2), @@ -733,21 +755,6 @@ INSERT INTO `report_group_sessions` (`id`, `userId`, `reportGroupId`, `sessionDa (9, 2, 4, '2025-10-18', '09:00:00', '10:30:00', 'Photosynthesis'), (10, 2, 5, '2025-10-19', '11:00:00', '12:30:00', 'Control structures'); --- ============================================================ --- Table: typeorm_metadata --- TypeORM metadata for generated columns and other metadata --- ============================================================ -DROP TABLE IF EXISTS `typeorm_metadata`; -CREATE TABLE `typeorm_metadata` ( - `type` varchar(255) NOT NULL, - `schema` varchar(255) DEFAULT NULL, - `table` varchar(255) DEFAULT NULL, - `name` varchar(255) DEFAULT NULL, - `value` text -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -SET FOREIGN_KEY_CHECKS = 1; - -- ============================================================ -- Table: texts -- Text content management @@ -977,6 +984,7 @@ INSERT INTO `numbers` (`id`, `number`) VALUES -- Views -- Critical view entities required by the application -- ============================================================ +SET FOREIGN_KEY_CHECKS = 1; CREATE VIEW `text_by_user` AS SELECT `t_base`.`name` AS `name`, @@ -996,13 +1004,14 @@ ORDER BY `users`.`id` ASC, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'text_by_user', 'SELECT `t_base`.`name` AS `name`, `t_base`.`description` AS `description`, `users`.`id` AS `userId`, `t_user`.`id` AS `overrideTextId`, CONCAT(`users`.`id`, \"_\", `t_base`.`id`) AS `id`, COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` FROM `texts` `t_base` LEFT JOIN `users` `users` ON `users`.`effective_id` is null LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` AND `t_user`.`user_id` = `users`.`id` WHERE `t_base`.`user_id` = 0 ORDER BY `users`.`id` ASC, `t_base`.`id` ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'text_by_user', 'SELECT `t_base`.`name` AS `name`, `t_base`.`description` AS `description`, `users`.`id` AS `userId`, `t_user`.`id` AS `overrideTextId`, CONCAT(`users`.`id`, \"_\", `t_base`.`id`) AS `id`, COALESCE(`t_user`.`value`, `t_base`.`value`) AS `value`, COALESCE(`t_user`.`filepath`, `t_base`.`filepath`) AS `filepath` FROM `texts` `t_base` LEFT JOIN `users` `users` ON `users`.`effective_id` is null LEFT JOIN `texts` `t_user` ON `t_user`.`name` = `t_base`.`name` AND `t_user`.`user_id` = `users`.`id` WHERE `t_base`.`user_id` = 0 ORDER BY `users`.`id` ASC, `t_base`.`id` ASC'); CREATE VIEW `lesson_klass_name` AS @@ -1020,13 +1029,14 @@ GROUP BY lessons.id, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'lesson_klass_name', 'SELECT lessons.id AS id,\n lessons.user_id AS user_id,\n GROUP_CONCAT(DISTINCT klasses.name SEPARATOR \', \') AS name\n FROM lessons\n LEFT JOIN JSON_TABLE(\n lessons.klass_reference_ids_json,\n \"$[*]\" COLUMNS(klass_id INT PATH \"$\")\n ) AS jt ON 1=1\n LEFT JOIN klasses ON klasses.id = jt.klass_id\n GROUP BY lessons.id, lessons.user_id'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'lesson_klass_name', 'SELECT lessons.id AS id,\n lessons.user_id AS user_id,\n GROUP_CONCAT(DISTINCT klasses.name SEPARATOR \', \') AS name\n FROM lessons\n LEFT JOIN JSON_TABLE(\n lessons.klass_reference_ids_json,\n \"$[*]\" COLUMNS(klass_id INT PATH \"$\")\n ) AS jt ON 1=1\n LEFT JOIN klasses ON klasses.id = jt.klass_id\n GROUP BY lessons.id, lessons.user_id'); CREATE VIEW `student_by_year` AS @@ -1045,13 +1055,14 @@ GROUP BY `students`.`id`; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_by_year', 'SELECT `students`.`id` AS `id`, `students`.`tz` AS `tz`, `students`.`name` AS `name`, `students`.`is_active` AS `isActive`, `students`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT `student_klasses`.`year`) AS `year`, GROUP_CONCAT(DISTINCT `student_klasses`.`klassReferenceId`) AS `klassReferenceIds`, GROUP_CONCAT(DISTINCT `klasses`.`klassTypeReferenceId`) AS `klassTypeReferenceIds` FROM `student_klasses` `student_klasses` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` GROUP BY `students`.`id`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_by_year', 'SELECT `students`.`id` AS `id`, `students`.`tz` AS `tz`, `students`.`name` AS `name`, `students`.`is_active` AS `isActive`, `students`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT `student_klasses`.`year`) AS `year`, GROUP_CONCAT(DISTINCT `student_klasses`.`klassReferenceId`) AS `klassReferenceIds`, GROUP_CONCAT(DISTINCT `klasses`.`klassTypeReferenceId`) AS `klassTypeReferenceIds` FROM `student_klasses` `student_klasses` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` GROUP BY `students`.`id`'); CREATE VIEW `student_base_klass` AS @@ -1074,13 +1085,14 @@ GROUP BY studentReferenceId, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_base_klass', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_base_klass', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); CREATE VIEW `abs_count_effect_by_user` AS @@ -1116,13 +1128,14 @@ ORDER BY `users`.`id` ASC, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'abs_count_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`count`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'abs_count_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`count`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); CREATE VIEW `att_report_and_grade` AS @@ -1164,13 +1177,14 @@ FROM grades; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'att_report_and_grade', 'SELECT\n CONCAT(\'a-\', id) AS id,\n \'att\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n abs_count,\n approved_abs_count,\n NULL AS \'grade\',\n NULL AS \'estimation\',\n comments,\n sheet_name\n FROM\n att_reports\n UNION\n SELECT\n CONCAT(\'g-\', id) AS id,\n \'grade\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n NULL AS \'abs_count\',\n NULL AS \'approved_abs_count\',\n grade,\n estimation,\n comments,\n NULL AS \'sheet_name\'\n FROM\n grades'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'att_report_and_grade', 'SELECT\n CONCAT(\'a-\', id) AS id,\n \'att\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n abs_count,\n approved_abs_count,\n NULL AS \'grade\',\n NULL AS \'estimation\',\n comments,\n sheet_name\n FROM\n att_reports\n UNION\n SELECT\n CONCAT(\'g-\', id) AS id,\n \'grade\' as \'type\',\n user_id,\n `year`,\n studentReferenceId,\n teacherReferenceId,\n lessonReferenceId,\n klassReferenceId,\n report_date,\n how_many_lessons,\n NULL AS \'abs_count\',\n NULL AS \'approved_abs_count\',\n grade,\n estimation,\n comments,\n NULL AS \'sheet_name\'\n FROM\n grades'); CREATE VIEW `att_report_with_report_month` AS @@ -1183,13 +1197,14 @@ FROM `att_reports` `ar` INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'att_report_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, ar.* FROM `att_reports` `ar` LEFT JOIN `report_month` `report_months` ON `ar`.`user_id` = `report_months`.`userId` AND `ar`.`report_date` <= `report_months`.`endDate` AND `ar`.`report_date` >= `report_months`.`startDate`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'att_report_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, ar.* FROM `att_reports` `ar` LEFT JOIN `report_month` `report_months` ON `ar`.`user_id` = `report_months`.`userId` AND `ar`.`report_date` <= `report_months`.`endDate` AND `ar`.`report_date` >= `report_months`.`startDate`'); CREATE VIEW `grade_effect_by_user` AS @@ -1225,13 +1240,14 @@ ORDER BY `users`.`id` ASC, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'grade_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`percents`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'grade_effect_by_user', 'SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number \n THEN CONCAT(LPAD(`att_grade_effect`.`percents`, 10, \'0\'), \'|\', `att_grade_effect`.`effect`)\n ELSE NULL END\n ), \n \'|\', -1\n ),\n \'0\'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC'); CREATE VIEW `grade_with_report_month` AS @@ -1244,13 +1260,14 @@ FROM `grades` `grades` INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'grade_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, grades.* FROM `grades` `grades` LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` AND `grades`.`report_date` <= `report_months`.`endDate` AND `grades`.`report_date` >= `report_months`.`startDate`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'grade_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, grades.* FROM `grades` `grades` LEFT JOIN `report_month` `report_months` ON `grades`.`user_id` = `report_months`.`userId` AND `grades`.`report_date` <= `report_months`.`endDate` AND `grades`.`report_date` >= `report_months`.`startDate`'); CREATE VIEW `known_absence_with_report_month` AS @@ -1263,13 +1280,14 @@ FROM `known_absences` `known_absences` INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'known_absence_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, known_absences.* FROM `known_absences` `known_absences` LEFT JOIN `report_month` `report_months` ON `known_absences`.`user_id` = `report_months`.`userId` AND `known_absences`.`report_date` <= `report_months`.`endDate` AND `known_absences`.`report_date` >= `report_months`.`startDate`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'known_absence_with_report_month', 'SELECT `report_months`.`id` AS `reportMonthReferenceId`, known_absences.* FROM `known_absences` `known_absences` LEFT JOIN `report_month` `report_months` ON `known_absences`.`user_id` = `report_months`.`userId` AND `known_absences`.`report_date` <= `report_months`.`endDate` AND `known_absences`.`report_date` >= `report_months`.`startDate`'); CREATE VIEW `student_global_report` AS @@ -1311,13 +1329,14 @@ GROUP BY studentReferenceId, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_global_report', 'SELECT `atag`.`year` AS `year`, `atag`.`teacherReferenceId` AS `teacherReferenceId`, CONCAT(COALESCE(studentReferenceId, \"null\"), \"_\", COALESCE(`atag`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(klassReferenceId, \"null\"), \"_\", COALESCE(lessonReferenceId, \"null\"), \"_\", COALESCE(`atag`.`user_id`, \"null\"), \"_\", COALESCE(`atag`.`year`, \"null\")) AS `id`, `atag`.`user_id` AS `user_id`, studentReferenceId, klassReferenceId, lessonReferenceId, CASE WHEN `klass_types`.`klassTypeEnum` = \"כיתת אם\" THEN 1 ELSE 0 END AS `isBaseKlass`, SUM(how_many_lessons) AS `lessons_count`, SUM(abs_count) AS `abs_count`, AVG(grade) AS `grade_avg` FROM `att_report_and_grade` `atag` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `atag`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, `atag`.`teacherReferenceId`, klassReferenceId, lessonReferenceId, `atag`.`user_id`, `atag`.`year`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_global_report', 'SELECT `atag`.`year` AS `year`, `atag`.`teacherReferenceId` AS `teacherReferenceId`, CONCAT(COALESCE(studentReferenceId, \"null\"), \"_\", COALESCE(`atag`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(klassReferenceId, \"null\"), \"_\", COALESCE(lessonReferenceId, \"null\"), \"_\", COALESCE(`atag`.`user_id`, \"null\"), \"_\", COALESCE(`atag`.`year`, \"null\")) AS `id`, `atag`.`user_id` AS `user_id`, studentReferenceId, klassReferenceId, lessonReferenceId, CASE WHEN `klass_types`.`klassTypeEnum` = \"כיתת אם\" THEN 1 ELSE 0 END AS `isBaseKlass`, SUM(how_many_lessons) AS `lessons_count`, SUM(abs_count) AS `abs_count`, AVG(grade) AS `grade_avg` FROM `att_report_and_grade` `atag` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `atag`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, `atag`.`teacherReferenceId`, klassReferenceId, lessonReferenceId, `atag`.`user_id`, `atag`.`year`'); CREATE VIEW `student_klasses_report` AS @@ -1393,13 +1412,14 @@ GROUP BY `students`.`id`, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_klasses_report', 'SELECT `student_klasses`.`year` AS `year`, `students`.`id` AS `id`, `students`.`id` AS `student_reference_id`, `students`.`tz` AS `student_tz`, `students`.`name` AS `student_name`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_null`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_null` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` GROUP BY `students`.`id`, `student_klasses`.`user_id`, `student_klasses`.`year`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_klasses_report', 'SELECT `student_klasses`.`year` AS `year`, `students`.`id` AS `id`, `students`.`id` AS `student_reference_id`, `students`.`tz` AS `student_tz`, `students`.`name` AS `student_name`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `student_klasses`.`klassReferenceId`, null) SEPARATOR \',\') AS `klassReferenceId_null`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'כיתת אם\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_1`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'מסלול\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_2`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_3`, GROUP_CONCAT(if(`klass_types`.`klassTypeEnum` = \'אחר\' || `klass_types`.`klassTypeEnum` is null, `klasses`.`name`, null) SEPARATOR \', \') AS `klass_name_null` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` LEFT JOIN `students` `students` ON `students`.`id` = `student_klasses`.`studentReferenceId` GROUP BY `students`.`id`, `student_klasses`.`user_id`, `student_klasses`.`year`'); CREATE VIEW `student_percent_report` AS @@ -1421,13 +1441,14 @@ FROM `student_global_report` `sgr`; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_percent_report', 'SELECT id, user_id, year, studentReferenceId, teacherReferenceId, klassReferenceId, lessonReferenceId, lessons_count, abs_count, COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) AS `abs_percents`, (1 - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1)) AS `att_percents`, grade_avg / 100 AS `grade_avg` FROM `student_global_report` `sgr`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_percent_report', 'SELECT id, user_id, year, studentReferenceId, teacherReferenceId, klassReferenceId, lessonReferenceId, lessons_count, abs_count, COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1) AS `abs_percents`, (1 - COALESCE(abs_count, 0) / GREATEST(COALESCE(lessons_count, 1), 1)) AS `att_percents`, grade_avg / 100 AS `grade_avg` FROM `student_global_report` `sgr`'); CREATE VIEW `student_speciality` AS @@ -1450,13 +1471,14 @@ GROUP BY studentReferenceId, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'student_speciality', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'student_speciality', 'SELECT `student_klasses`.`year` AS `year`, studentReferenceId AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT if(`klass_types`.`klassTypeEnum` = \'התמחות\', `klasses`.`name`, null) SEPARATOR \', \') AS `base_klass` FROM `student_klasses` `student_klasses` LEFT JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` LEFT JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` GROUP BY studentReferenceId, user_id, year'); CREATE VIEW `teacher_lesson_grade_report_status` AS @@ -1491,13 +1513,14 @@ ORDER BY `report_months`.`id` ASC; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_lesson_grade_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`grades`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` AND `grades`.`lessonReferenceId` = `lessons`.`id` AND `grades`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'teacher_lesson_grade_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`grades`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` LEFT JOIN `grade_with_report_month` `grades` ON `grades`.`teacherReferenceId` = `teachers`.`id` AND `grades`.`lessonReferenceId` = `lessons`.`id` AND `grades`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); CREATE VIEW `teacher_grade_report_status` AS @@ -1553,13 +1576,14 @@ ORDER BY `tlrs`.`reportMonthId` ASC, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_grade_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_grade_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'teacher_grade_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_grade_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC'); CREATE VIEW `teacher_salary_report` AS @@ -1589,13 +1613,14 @@ FROM `att_report_with_report_month` `att_reports`; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_salary_report', 'SELECT DISTINCT `att_reports`.`year` AS `year`, `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, `att_reports`.`klassReferenceId` AS `klassReferenceId`, `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, CONCAT(COALESCE(`att_reports`.`user_id`, \"null\"), \"_\", COALESCE(`att_reports`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`lessonReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`klassReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`how_many_lessons`, \"null\"), \"_\", COALESCE(`att_reports`.`year`, \"null\"), \"_\", COALESCE(`att_reports`.`reportMonthReferenceId`, \"null\")) AS `id`, `att_reports`.`user_id` AS `userId`, `att_reports`.`how_many_lessons` AS `how_many_lessons` FROM `att_report_with_report_month` `att_reports`'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'teacher_salary_report', 'SELECT DISTINCT `att_reports`.`year` AS `year`, `att_reports`.`teacherReferenceId` AS `teacherReferenceId`, `att_reports`.`klassReferenceId` AS `klassReferenceId`, `att_reports`.`lessonReferenceId` AS `lessonReferenceId`, `att_reports`.`reportMonthReferenceId` AS `reportMonthReferenceId`, CONCAT(COALESCE(`att_reports`.`user_id`, \"null\"), \"_\", COALESCE(`att_reports`.`teacherReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`lessonReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`klassReferenceId`, \"null\"), \"_\", COALESCE(`att_reports`.`how_many_lessons`, \"null\"), \"_\", COALESCE(`att_reports`.`year`, \"null\"), \"_\", COALESCE(`att_reports`.`reportMonthReferenceId`, \"null\")) AS `id`, `att_reports`.`user_id` AS `userId`, `att_reports`.`how_many_lessons` AS `how_many_lessons` FROM `att_report_with_report_month` `att_reports`'); CREATE VIEW `teacher_lesson_report_status` AS @@ -1631,13 +1656,14 @@ ORDER BY `report_months`.`id` ASC; INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_lesson_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` AND `report_months`.`year` = `lessons`.`year` LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` AND `att_reports`.`lessonReferenceId` = `lessons`.`id` AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'teacher_lesson_report_status', 'SELECT `teachers`.`id` AS `teacherId`, `lessons`.`id` AS `lessonId`, `lessons`.`year` AS `year`, `lessons`.`name` AS `lessonName`, `report_months`.`id` AS `reportMonthId`, `teachers`.`user_id` AS `userId`, CASE WHEN COUNT(`att_reports`.`id`) > 0 THEN 1 ELSE 0 END AS `isReported` FROM `teachers` `teachers` INNER JOIN `lessons` `lessons` ON `lessons`.`teacherReferenceId` = `teachers`.`id` LEFT JOIN `report_month` `report_months` ON `report_months`.`userId` = `teachers`.`user_id` AND `report_months`.`year` = `lessons`.`year` LEFT JOIN `att_report_with_report_month` `att_reports` ON `att_reports`.`teacherReferenceId` = `teachers`.`id` AND `att_reports`.`lessonReferenceId` = `lessons`.`id` AND `att_reports`.`reportMonthReferenceId` = `report_months`.`id` WHERE COALESCE(`lessons`.`start_date`, `report_months`.`endDate`) <= `report_months`.`endDate` AND COALESCE(`lessons`.`end_date`, `report_months`.`startDate`) >= `report_months`.`startDate` GROUP BY `teachers`.`id`, `lessons`.`id`, `report_months`.`id` ORDER BY `report_months`.`id` ASC'); CREATE VIEW `teacher_report_status` AS @@ -1693,10 +1719,11 @@ ORDER BY `tlrs`.`reportMonthId` ASC, INSERT INTO `typeorm_metadata`( + `database`, `schema`, `table`, `type`, `name`, `value` ) -VALUES (DEFAULT, DEFAULT, 'VIEW', 'teacher_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC') \ No newline at end of file +VALUES (DEFAULT, 'mysql_database', DEFAULT, 'VIEW', 'teacher_report_status', 'SELECT `tlrs`.`userId` AS `userId`, `tlrs`.`year` AS `year`, `tlrs`.`teacherId` AS `teacherId`, `tlrs`.`reportMonthId` AS `reportMonthId`, `teacher`.`name` AS `teacherName`, `teacher`.`comment` AS `teacherComment`, `rm`.`name` AS `reportMonthName`, CONCAT(COALESCE(`tlrs`.`userId`, \"null\"), \"_\", COALESCE(`tlrs`.`teacherId`, \"null\"), \"_\", COALESCE(`tlrs`.`reportMonthId`, \"null\"), \"_\", COALESCE(`tlrs`.`year`, \"null\")) AS `id`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `reportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonId` END ORDER BY `tlrs`.`lessonName`) AS `notReportedLessons`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 1 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `reportedLessonNames`, GROUP_CONCAT(DISTINCT CASE WHEN `tlrs`.`isReported` = 0 THEN `tlrs`.`lessonName` END ORDER BY `tlrs`.`lessonName` SEPARATOR \", \") AS `notReportedLessonNames` FROM `teacher_lesson_report_status` `tlrs` LEFT JOIN `teachers` `teacher` ON `tlrs`.`teacherId` = `teacher`.`id` LEFT JOIN `report_month` `rm` ON `tlrs`.`reportMonthId` = `rm`.`id` GROUP BY `tlrs`.`userId`, `tlrs`.`teacherId`, `tlrs`.`reportMonthId`, `tlrs`.`year` ORDER BY `tlrs`.`reportMonthId` ASC, `tlrs`.`teacherId` ASC') \ No newline at end of file