Merge pull request #23 from joshuaalpuerto/wip/add-updated-by-column

add updated by column
joshuaalpuerto · Jul 1, 2018 · 0276f56 · 0276f56
2 parents 22767a4 + a2716bc
commit 0276f56
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 10 deletions.
diff --git a/src/app/company/get.js b/src/app/company/get.js
@@ -9,7 +9,7 @@ module.exports = ({ companyRepository }) => {
       .then(() =>
         companyRepository.getAll({
           attributes: [
-            'id', 'name', 'address', 'contact', 'tin', 'sss', 'philhealth', 'isDeleted', 'createdBy'
+            'id', 'name', 'address', 'contact', 'tin', 'sss', 'philhealth', 'isDeleted', 'createdBy', 'updatedBy'
           ]
         })
       )

diff --git a/src/app/user/get.js b/src/app/user/get.js
@@ -9,7 +9,7 @@ module.exports = ({ userRepository }) => {
       .then(() =>
       userRepository.getAll({
         attributes: [
-          'id', 'firstName', 'lastName', 'middleName', 'email', 'roleId', 'isDeleted', 'createdBy'
+          'id', 'firstName', 'lastName', 'middleName', 'email', 'roleId', 'isDeleted', 'createdBy', 'updatedBy'
         ]
       })
       )

diff --git a/src/domain/company/company.js b/src/domain/company/company.js
@@ -11,7 +11,10 @@ const Company = t.struct({
   sss: t.String,
   philhealth: t.String,
   isDeleted: t.Number,
-  createdBy: t.String
+  createdBy: t.maybe(t.String),
+  updatedBy: t.maybe(t.String),
+  createdAt: t.maybe(t.Date),
+  updatedAt: t.maybe(t.Date)
 })
 
 module.exports = compose(

diff --git a/src/domain/user/user.js b/src/domain/user/user.js
@@ -13,7 +13,10 @@ const User = t.struct({
   verificationCode: t.maybe(t.String),
   isVerified: t.maybe(t.Number),
   isDeleted: t.Number,
-  createdBy: t.String
+  createdBy: t.maybe(t.String),
+  updatedBy: t.maybe(t.String),
+  createdAt: t.maybe(t.Date),
+  updatedAt: t.maybe(t.Date)
 })
 
 module.exports = compose(

diff --git a/src/infra/database/models/company.js b/src/infra/database/models/company.js
@@ -1,5 +1,5 @@
 module.exports = function (sequelize, DataTypes) {
-  const User = sequelize.define('companies', {
+  const Company = sequelize.define('companies', {
     id: {
       type: DataTypes.UUID,
       defaultValue: DataTypes.UUIDV4,
@@ -37,6 +37,10 @@ module.exports = function (sequelize, DataTypes) {
     createdBy: {
       type: DataTypes.UUID,
       allowNull: false
+    },
+    updatedBy: {
+      type: DataTypes.UUID,
+      allowNull: true
     }
   }, {
     freezeTableName: true,
@@ -48,5 +52,5 @@ module.exports = function (sequelize, DataTypes) {
     }
   })
 
-  return User
+  return Company
 }
diff --git a/src/infra/database/models/user.js b/src/infra/database/models/user.js
@@ -48,6 +48,10 @@ module.exports = function (sequelize, DataTypes) {
     createdBy: {
       type: DataTypes.UUID,
       allowNull: false
+    },
+    updatedBy: {
+      type: DataTypes.UUID,
+      allowNull: true
     }
   }, {
     hooks: {

diff --git a/src/infra/repositories/transforms/company.js b/src/infra/repositories/transforms/company.js
@@ -9,7 +9,8 @@ const toEntity = ({
   sss,
   philhealth,
   isDeleted,
-  createdBy
+  createdBy,
+  updatedBy
 }) => Company({
   id,
   name,
@@ -19,7 +20,8 @@ const toEntity = ({
   sss,
   philhealth,
   isDeleted,
-  createdBy
+  createdBy,
+  updatedBy
 })
 
 module.exports = {

diff --git a/src/infra/repositories/transforms/user.js b/src/infra/repositories/transforms/user.js
@@ -9,7 +9,8 @@ const toEntity = ({
   password,
   roleId,
   isDeleted,
-  createdBy
+  createdBy,
+  updatedBy
 }) => User({
   id,
   firstName,
@@ -19,7 +20,8 @@ const toEntity = ({
   password,
   roleId,
   isDeleted,
-  createdBy
+  createdBy,
+  updatedBy
 })
 
 module.exports = {

diff --git a/src/infra/sequelize/migrations/001-users.js b/src/infra/sequelize/migrations/001-users.js
@@ -49,6 +49,10 @@ module.exports = {
         type: Sequelize.UUID,
         allowNull: false
       },
+      updatedBy: {
+        type: Sequelize.UUID,
+        allowNull: true
+      },
       createdAt: {
         allowNull: false,
         type: Sequelize.DATE,

diff --git a/src/infra/sequelize/migrations/002-company.js b/src/infra/sequelize/migrations/002-company.js
@@ -40,6 +40,10 @@ module.exports = {
         type: Sequelize.UUID,
         allowNull: false
       },
+      updatedBy: {
+        type: Sequelize.UUID,
+        allowNull: true
+      },
       createdAt: {
         allowNull: false,
         type: Sequelize.DATE,