fix(#316): Changed the timestamp Object type for user microservice (#321

) * fix - 316: Changed the timestamp Object type * Removed unused type * updated the variable for the time stamp
1-Platform · May 19, 2020 · 1c94bd8 · 1c94bd8
1 parent 42436b1
commit 1c94bd8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 58 deletions.
diff --git a/packages/user-service/src/cron.ts b/packages/user-service/src/cron.ts
@@ -32,7 +32,7 @@ export class UserSyncCron {
                 newProfile[0].uid = response.uid;
                 newProfile[0].memberOf = groups;
                 newProfile[0].isActive = true;
-                newProfile[0].timestamp.modifiedAt = moment(new Date());
+                newProfile[0].updatedOn = moment( new Date() );
                 return User.findByIdAndUpdate(oldProfile[0]._id, newProfile[0], { new: true })
                        .exec();
               }

diff --git a/packages/user-service/src/resolver.ts b/packages/user-service/src/resolver.ts
@@ -69,9 +69,8 @@ export const UserGroupResolver = {
                   memberOf: groups,
                   isActive: true,
                   apiRole: ( groups.includes( 'one-portal-devel' ) ) ? `ADMIN` : 'USER',
-                  timestamp: {
-                    createdAt: moment.utc( new Date() )
-                  }
+                  createdBy: response.rhatUUID,
+                  createdOn: moment.utc( new Date() )
                 } );
                 return newUser.save();
               } else {

diff --git a/packages/user-service/src/schema.ts b/packages/user-service/src/schema.ts
@@ -8,19 +8,11 @@ export const UserSchema: Schema = new Schema({
   isActive: Boolean,
   memberOf: [String],
   apiRole: String,
-  timestamp: {
-    createdAt: { type: Date, default: Date.now },
-    createdBy: {
-      uid: String,
-      name: String,
-    },
-    modifiedAt: { type: Date },
-    modifiedBy: {
-      uid: String,
-      name: String,
-    }
-  }
-});
+  createdBy: String,
+  createdOn: Date,
+  updatedBy: String,
+  updatedOn: Date,
+} );
 
 interface UserModel extends UserType , Document { }
 

diff --git a/packages/user-service/src/typedef.graphql b/packages/user-service/src/typedef.graphql
@@ -68,30 +68,6 @@ type LdapType {
   objectClass: [String]
 }
 
-type ProfileType {
-  kerberosID: String
-  name: String
-}
-
-type TimestampType {
-  createdAt: DateTime
-  createdBy: ProfileType
-  modifiedAt: DateTime
-  modifiedBy: ProfileType
-}
-
-input ProfileInput {
-  kerberosID: String
-  name: String
-}
-
-input TimestampInput {
-  createdAt: DateTime
-  createdBy: ProfileInput
-  modifiedAt: DateTime
-  modifiedBy: ProfileInput
-}
-
 type UserType {
   _id: String
   name: String
@@ -100,8 +76,11 @@ type UserType {
   rhatUUID: String
   memberOf: [String]
   isActive: Boolean
-  apiRole: APIROLE,
-  timestamp: TimestampType
+  apiRole: APIROLE
+  createdBy: String
+  createdOn: DateTime
+  updatedBy: String
+  updatedOn: DateTime
 }
 input UserInput {
   _id: String
@@ -111,8 +90,11 @@ input UserInput {
   rhatUUID: String
   memberOf: [String]
   isActive: Boolean
-  apiRole: APIROLE,
-  timestamp: TimestampInput
+  apiRole: APIROLE
+  createdBy: String
+  createdOn: DateTime
+  updatedBy: String
+  updatedOn: DateTime
 }
 
 type Mutation  {

diff --git a/packages/user-service/src/types.d.ts b/packages/user-service/src/types.d.ts
@@ -64,18 +64,6 @@ type LdapType = {
   objectClass?: string[];
 }
 
-type IUser = {
-  uid: string;
-  name: string;
-}
-
-type ITimestamp = {
-  createdAt: Date;
-  createdBy: IUser;
-  modifiedAt?: Date;
-  modifiedBy?: IUser;
-}
-
 type UserType = {
   name: string;
   title: string;
@@ -84,5 +72,8 @@ type UserType = {
   isActive ?: boolean;
   memberOf: string[];
   apiRole: string,
-  timestamp ?: ITimestamp;
+  createdBy: string;
+  createdOn: Date;
+  updatedBy: string;
+  updatedOn: Date;
 }