Merge pull request #403 from topcoder-platform/cleanup_indices

cleanup indices
topcoder-platform · Jun 7, 2021 · 87355ab · 87355ab
2 parents 3c5f760 + 792b2df
commit 87355ab
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 83 deletions.
diff --git a/src/common/db-helper.js b/src/common/db-helper.js
@@ -220,8 +220,8 @@ async function queryOneActiveCopilotPayment(model, project, username) {
 async function queryOneUserGroupMapping(model, groupId, gitlabUserId) {
   return await new Promise((resolve, reject) => {
     model.query('groupId').eq(groupId)
-    .filter('gitlabUserId')
-    .eq(gitlabUserId)
+    .where('gitlabUserId')
+    .eq(gitlabUserId.toString())
     .all()
     .exec((err, result) => {
       if (err || !result) {
@@ -244,7 +244,7 @@ async function queryOneUserGroupMapping(model, groupId, gitlabUserId) {
 async function queryOneUserTeamMapping(model, teamId, githubUserName, githubOrgId) {
   return await new Promise((resolve, reject) => {
     model.query('teamId').eq(teamId)
-    .filter('githubUserName')
+    .where('githubUserName')
     .eq(githubUserName)
     .filter('githubOrgId')
     .eq(githubOrgId)

diff --git a/src/models/Issue.js b/src/models/Issue.js
@@ -16,26 +16,14 @@ const schema = new Schema({
   // From the receiver service
   number: {
     type: Number,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'NumberIndex',
-    },
+    required: true
   },
   title: {type: String, required: true},
   body: {type: String},
   prizes: {type: [Number], required: true}, // extracted from title
   provider: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'ProviderIndex',
-    },
+    required: true
   }, // github or gitlab
   repositoryId: {
     type: Number,

diff --git a/src/models/OwnerUserGroup.js b/src/models/OwnerUserGroup.js
@@ -15,24 +15,12 @@ const schema = new Schema({
   },
   ownerUsername: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'OwnerUsernameIndex',
-    },
+    required: true
   },
   type: {
     type: String,
     required: true,
-    enum: _.values(constants.USER_TYPES),
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'TypeIndex',
-    },
+    enum: _.values(constants.USER_TYPES)
   },
   groupId: {
     type: String,
@@ -56,13 +44,7 @@ const schema = new Schema({
   },
   accessLevel: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'AccessLevelIndex',
-    },
+    required: true
   },
   expiredAt: {
     type: String,

diff --git a/src/models/OwnerUserTeam.js b/src/models/OwnerUserTeam.js
@@ -15,24 +15,12 @@ const schema = new Schema({
   },
   ownerUsername: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'OwnerUsernameIndex',
-    },
+    required: true
   },
   type: {
     type: String,
     required: true,
-    enum: _.values(constants.USER_TYPES),
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'TypeIndex',
-    },
+    enum: _.values(constants.USER_TYPES)
   },
   teamId: {
     type: String,
@@ -46,13 +34,7 @@ const schema = new Schema({
   },
   githubOrgId: {
     type: String,
-    required: false,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'RepositoryIdIndex',
-    },
+    required: false
   },
   ownerToken: {type: String, required: true},
   identifier: {
@@ -67,13 +49,7 @@ const schema = new Schema({
   },
   accessLevel: {
     type: String,
-    required: false,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'AccessLevelIndex',
-    },
+    required: false
   },
   organizationName: { type: String, required: false }
 });

diff --git a/src/models/User.js b/src/models/User.js
@@ -16,13 +16,7 @@ const schema = new Schema({
   },
   userProviderId: {
     type: Number,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'UsesProviderIdIndex',
-    },
+    required: true
   },
   userProviderIdStr: {
     type: String,
@@ -41,13 +35,7 @@ const schema = new Schema({
   role: {
     type: String,
     required: true,
-    enum: _.values(constants.USER_ROLES),
-    index: {
-      global: true,
-      project: true,
-      name: 'RoleIndex',
-      rangeKey: 'id',
-    },
+    enum: _.values(constants.USER_ROLES)
   },
   type: {
     type: String,

diff --git a/src/models/UserGroupMapping.js b/src/models/UserGroupMapping.js
@@ -17,7 +17,7 @@ const schema = new Schema({
     index: {
       global: true,
       project: true,
-      rangKey: 'gitlabUserId',
+      rangeKey: 'gitlabUserId',
       name: 'GroupIdIndex',
     },
   },

diff --git a/src/models/UserMapping.js b/src/models/UserMapping.js
@@ -17,7 +17,7 @@ const schema = new Schema({
     index: {
       global: true,
       project: true,
-      rangKey: 'id',
+      rangeKey: 'id',
       name: 'TopcoderUsernameIndex',
     },
   },

diff --git a/src/models/UserTeamMapping.js b/src/models/UserTeamMapping.js
@@ -17,7 +17,7 @@ const schema = new Schema({
     index: {
       global: true,
       project: true,
-      rangKey: 'githubUserName',
+      rangeKey: 'githubUserName',
       name: 'TopcoderTeamIdIndex',
     },
   },