@churchsoln/dbms 1.0.31 → 1.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/db-setup.js +1 -1
  2. package/migrations/church/20221227151615-create-user.js +1 -0
  3. package/migrations/church/20240918170620-create-donation.js +4 -4
  4. package/migrations/church/20240918170627-create-pledge.js +7 -7
  5. package/models/church/donation.js +7 -7
  6. package/models/church/member.js +1 -0
  7. package/models/church/membership.js +1 -0
  8. package/models/church/pledge.js +8 -8
  9. package/package.json +1 -1
  10. package/workers/db-create.js +1 -1
package/db-setup.js CHANGED
@@ -20,7 +20,7 @@ async function ensureDatabaseExists() {
20
20
 
21
21
  if (results.length === 0) {
22
22
  console.log(`Database "${database}" does not exist. Creating...`);
23
- await sequelize.query(`CREATE DATABASE "${database}"`);
23
+ await sequelize.query(`CREATE DATABASE "${database}" TEMPLATE template0`);
24
24
  console.log(`Database "${database}" created successfully.`);
25
25
  } else {
26
26
  console.log(`Database "${database}" already exists.`);
package/migrations/church/20221227151615-create-user.js CHANGED
@@ -7,6 +7,7 @@ module.exports = {
7
7
  // Link to the individual profile
8
8
  memberId: {
9
9
  type: DataTypes.INTEGER,
10
+ unique: true,
10
11
  references: {
11
12
  model: "Member",
12
13
  key: "id",
package/migrations/church/20240918170620-create-donation.js CHANGED
@@ -6,7 +6,7 @@ module.exports = {
6
6
  "Donation",
7
7
  {
8
8
  id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
9
- userId: { type: DataTypes.INTEGER },
9
+ memberId: { type: DataTypes.INTEGER },
10
10
  transferTypeId: { type: DataTypes.INTEGER },
11
11
  accountId: { type: DataTypes.INTEGER },
12
12
  transferedAt: { type: DataTypes.DATE },
@@ -29,11 +29,11 @@ module.exports = {
29
29
  )
30
30
  .then(() =>
31
31
  queryInterface.addConstraint("Donation", {
32
- fields: ["userId"],
32
+ fields: ["memberId"],
33
33
  type: "foreign key",
34
- name: "Donation_UserId_Fkey",
34
+ name: "Donation_MemberId_Fkey",
35
35
  references: {
36
- table: "User",
36
+ table: "Member",
37
37
  field: "id",
38
38
  },
39
39
  onDelete: "cascade",
package/migrations/church/20240918170627-create-pledge.js CHANGED
@@ -7,7 +7,7 @@ module.exports = {
7
7
  "Pledge",
8
8
  {
9
9
  id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
10
- userId: { type: DataTypes.INTEGER },
10
+ memberId: { type: DataTypes.INTEGER },
11
11
  accountId: { type: DataTypes.INTEGER },
12
12
  frequency: { type: DataTypes.STRING },
13
13
  duration: { type: DataTypes.INTEGER },
@@ -30,11 +30,11 @@ module.exports = {
30
30
  )
31
31
  .then(() =>
32
32
  queryInterface.addConstraint("Pledge", {
33
- fields: ["userId"],
33
+ fields: ["memberId"],
34
34
  type: "foreign key",
35
- name: "Pledge_UserId_Fkey",
35
+ name: "Pledge_MemberId_Fkey",
36
36
  references: {
37
- table: "User",
37
+ table: "Member",
38
38
  field: "id",
39
39
  },
40
40
  onDelete: "cascade",
@@ -58,7 +58,7 @@ module.exports = {
58
58
  type: "foreign key",
59
59
  name: "Pledge_CreatedBy_Fkey",
60
60
  references: {
61
- table: "User",
61
+ table: "Member",
62
62
  field: "id",
63
63
  },
64
64
  onDelete: "cascade",
@@ -70,7 +70,7 @@ module.exports = {
70
70
  type: "foreign key",
71
71
  name: "Pledge_UpdatedBy_Fkey",
72
72
  references: {
73
- table: "User",
73
+ table: "Member",
74
74
  field: "id",
75
75
  },
76
76
  onDelete: "cascade",
@@ -82,7 +82,7 @@ module.exports = {
82
82
  type: "foreign key",
83
83
  name: "Pledge_DeletedBy_Fkey",
84
84
  references: {
85
- table: "User",
85
+ table: "Member",
86
86
  field: "id",
87
87
  },
88
88
  onDelete: "cascade",
package/models/church/donation.js CHANGED
@@ -3,10 +3,10 @@ module.exports = (sequelize, DataTypes) => {
3
3
  "Donation",
4
4
  {
5
5
  id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
6
- userId: {
6
+ memberId: {
7
7
  type: DataTypes.INTEGER,
8
- set(userId) {
9
- this.setDataValue("userId", userId?.id || userId);
8
+ set(memberId) {
9
+ this.setDataValue("memberId", memberId?.id || memberId);
10
10
  },
11
11
  },
12
12
  transferTypeId: {
@@ -40,9 +40,9 @@ module.exports = (sequelize, DataTypes) => {
40
40
  { freezeTableName: true, timestamps: false }
41
41
  );
42
42
  donation.associate = function (models) {
43
- donation.belongsTo(models.user, {
44
- foreignKey: "userId",
45
- as: "user",
43
+ donation.belongsTo(models.member, {
44
+ foreignKey: "memberId",
45
+ as: "member",
46
46
  });
47
47
  donation.belongsTo(models.transferType, {
48
48
  foreignKey: "transferTypeId",
@@ -55,7 +55,7 @@ module.exports = (sequelize, DataTypes) => {
55
55
  };
56
56
  donation.selectedFields = [
57
57
  "id",
58
- "userId",
58
+ "memberId",
59
59
  "transferTypeId",
60
60
  "accountId",
61
61
  "transferedAt",
package/models/church/member.js CHANGED
@@ -121,6 +121,7 @@ module.exports = (sequelize, DataTypes) => {
121
121
  { freezeTableName: true, timestamps: false }
122
122
  );
123
123
  member.associate = function (models) {
124
+ member.hasOne(models.user, { foreignKey: "memberId", as: "user" });
124
125
  member.belongsTo(models.membership, { foreignKey: "membershipId", as: "membership" });
125
126
  member.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
126
127
  member.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
package/models/church/membership.js CHANGED
@@ -52,6 +52,7 @@ module.exports = (sequelize, DataTypes) => {
52
52
  { freezeTableName: true, timestamps: false }
53
53
  );
54
54
  membership.associate = function (models) {
55
+ membership.hasMany(models.member, { foreignKey: "membershipId", as: "member" });
55
56
  membership.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
56
57
  membership.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
57
58
  }
package/models/church/pledge.js CHANGED
@@ -3,7 +3,7 @@ module.exports = (sequelize, DataTypes) => {
3
3
  "Pledge",
4
4
  {
5
5
  id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
6
- userId: { type: DataTypes.INTEGER },
6
+ memberId: { type: DataTypes.INTEGER },
7
7
  accountId: { type: DataTypes.INTEGER },
8
8
  frequency: { type: DataTypes.STRING },
9
9
  duration: { type: DataTypes.INTEGER },
@@ -25,30 +25,30 @@ module.exports = (sequelize, DataTypes) => {
25
25
  { freezeTableName: true, timestamps: false }
26
26
  );
27
27
  pledge.associate = function (models) {
28
- pledge.belongsTo(models.user, {
29
- foreignKey: "userId",
30
- as: "user",
28
+ pledge.belongsTo(models.member, {
29
+ foreignKey: "memberId",
30
+ as: "member",
31
31
  });
32
32
  pledge.belongsTo(models.accounts, {
33
33
  foreignKey: "accountId",
34
34
  as: "accounts",
35
35
  });
36
- pledge.belongsTo(models.user, {
36
+ pledge.belongsTo(models.member, {
37
37
  foreignKey: "createdBy",
38
38
  as: "createdByUser",
39
39
  });
40
- pledge.belongsTo(models.user, {
40
+ pledge.belongsTo(models.member, {
41
41
  foreignKey: "updatedBy",
42
42
  as: "updatedByUser",
43
43
  });
44
- pledge.belongsTo(models.user, {
44
+ pledge.belongsTo(models.member, {
45
45
  foreignKey: "deletedBy",
46
46
  as: "deletedByUser",
47
47
  });
48
48
  };
49
49
  pledge.selectedFields = [
50
50
  "id",
51
- "userId",
51
+ "memberId",
52
52
  "accountId",
53
53
  "frequency",
54
54
  "duration",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchsoln/dbms",
3
- "version": "1.0.31",
3
+ "version": "1.0.33",
4
4
  "main": "index.js",
5
5
  "scripts": {
6
6
  "prestart": "node db-setup.js",
package/workers/db-create.js CHANGED
@@ -13,7 +13,7 @@ new Worker(
13
13
  { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_IN_PROGRESS },
14
14
  { where: { id: churchId } }
15
15
  );
16
- await commonDb.sequelize.query(`CREATE DATABASE "${name}"`);
16
+ await commonDb.sequelize.query(`CREATE DATABASE "${name}" TEMPLATE template0`);
17
17
  await commonDb.church.update(
18
18
  { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_COMPLETED },
19
19
  { where: { id: churchId } }