Schema updates

src/database/migrations/20231211111208-update-users-credentials-table.js

@@ -0,0 +1,28 @@
+'use strict'
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+	async up(queryInterface, Sequelize) {
+		// Remove the current primary key constraint
+		await queryInterface.removeConstraint('users_credentials', 'users_credentials_pkey')
+
+		// Add the 'email' column as the new primary key
+		await queryInterface.addConstraint('users_credentials', {
+			fields: ['email'],
+			type: 'primary key',
+			name: 'users_credentials_pkey',
+		})
+	},
+
+	async down(queryInterface, Sequelize) {
+		// Remove the current primary key constraint
+		await queryInterface.removeConstraint('users_credentials', 'users_credentials_email_pkey')
+
+		// Recreate the primary key constraint on the 'id' column
+		await queryInterface.addConstraint('users_credentials', {
+			fields: ['id'],
+			type: 'primary key',
+			name: 'users_credentials_pkey',
+		})
+	},
+}

src/database/migrations/20231211113143-update-org-invites-composite-pk.js

@@ -0,0 +1,28 @@
+'use strict'
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+	async up(queryInterface, Sequelize) {
+		// Remove the current primary key constraint
+		await queryInterface.removeConstraint('organization_user_invites', 'org_user_invites_pkey')
+
+		// Add the 'id' and 'organization_id' columns as the new composite primary key
+		await queryInterface.addConstraint('organization_user_invites', {
+			fields: ['id', 'organization_id'],
+			type: 'primary key',
+			name: 'org_user_invites_pkey',
+		})
+	},
+
+	async down(queryInterface, Sequelize) {
+		// Remove the current primary key constraint
+		await queryInterface.removeConstraint('organization_user_invites', 'org_user_invites_pkey')
+
+		// Recreate the primary key constraint on the 'id' column
+		await queryInterface.addConstraint('organization_user_invites', {
+			fields: ['id'],
+			type: 'primary key',
+			name: 'org_user_invites_pkey',
+		})
+	},
+}

src/database/models/organizationUserInvite.js

@@ -20,6 +20,7 @@ module.exports = (sequelize, DataTypes) => {
 			organization_id: {
 				type: DataTypes.INTEGER,
 				allowNull: false,
+				primaryKey: true,
 			},
 			roles: {
 				type: DataTypes.ARRAY(DataTypes.INTEGER),

src/database/models/userCredential.js

@@ -6,13 +6,13 @@ module.exports = (sequelize, DataTypes) => {
 			id: {
 				type: DataTypes.INTEGER,
 				allowNull: false,
-				primaryKey: true,
 				autoIncrement: true,
 			},
 			email: {
 				type: DataTypes.STRING,
 				allowNull: false,
 				unique: true,
+				primaryKey: true,
 			},
 			password: {
 				type: DataTypes.STRING,

src/services/account.js

@@ -95,7 +95,7 @@ module.exports = class AccountHelper {
 			if (invitedUserId) {
 				invitedUserMatch = await userInviteQueries.findOne({
 					id: invitedUserId.organization_user_invite_id,
-				})
+				}) //add org id here to optimize the query
 			}
 
 			let isOrgAdmin = false