Skip to content

Beta Release 3.3.0 #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
76c64a5
Add the performance testing code
codejamtc Dec 22, 2020
accc73a
Update README.md
codejamtc Dec 22, 2020
c05fc86
Update config.yml
codejamtc Dec 22, 2020
ff43cb4
Update config.yml
codejamtc Dec 23, 2020
ca831c0
Merge pull request #606 from topcoder-platform/hotfix/milestone-delete
RishiRajSahu Dec 29, 2020
7d71274
Update config.yml
codejamtc Jan 6, 2021
a8567db
Merge branch 'develop' into connect-performance-testing
codejamtc Jan 6, 2021
3009b3d
Update config.yml
codejamtc Jan 6, 2021
a30c703
Update JMeter_README.md
codejamtc Jan 6, 2021
ac6312d
Update config.yml
codejamtc Jan 6, 2021
bf6f03d
Revert "chore: temporary disable jobs creation"
maxceem Jan 6, 2021
8a3544a
feat: updated TaaS Job creation data
maxceem Jan 7, 2021
f94ae6a
fix: creating taas jobs
maxceem Jan 7, 2021
4ff4dac
fix: rename field of TaaS Jobs
maxceem Jan 7, 2021
6b8813c
Merge pull request #603 from topcoder-platform/connect-performance-te…
RishiRajSahu Jan 8, 2021
f6177a1
fix: use "weekly" rateType for create jobs
maxceem Jan 11, 2021
b2f1a43
feat: don't set unknown fields for Jobs
maxceem Jan 12, 2021
2581421
Add unit test to the circleci conf file
codejamtc Jan 12, 2021
c0599ab
Update config.yml
codejamtc Jan 12, 2021
743ef07
Update config.yml
codejamtc Jan 12, 2021
41c04d3
Update config.yml
codejamtc Jan 12, 2021
cbbc13f
Update config.yml
codejamtc Jan 12, 2021
2d2ab63
fix: lint
maxceem Jan 12, 2021
e66d88d
Merge branch 'develop' into connect-performance-testing
codejamtc Jan 12, 2021
8c062b8
Update config.yml
codejamtc Jan 12, 2021
a2ffa2c
Merge pull request #612 from topcoder-platform/connect-performance-te…
maxceem Jan 12, 2021
cb0f4f6
feat: update "project.terms" type to string
maxceem Jan 23, 2021
fef4c17
feat: add "project.groups" field
maxceem Jan 24, 2021
cdb331c
Merge pull request #618 from topcoder-platform/feature/update-project…
Jan 25, 2021
6a966b6
Merge branch 'master' into develop
Feb 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions docs/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4939,8 +4939,11 @@ definitions:
terms:
type: array
items:
type: number
format: integer
type: string
groups:
type: array
items:
type: string
external:
type: object
description: 'READ-ONLY, OPTIONAL. Refernce to external task/issue.'
Expand Down Expand Up @@ -5070,8 +5073,11 @@ definitions:
terms:
type: array
items:
type: number
format: integer
type: string
groups:
type: array
items:
type: string
name:
type: string
description: project name
Expand Down Expand Up @@ -5254,7 +5260,7 @@ definitions:
type:
type: string
description: The attachment type, one of 'link' or 'file'
enum:
enum:
- link
- file
tags:
Expand Down Expand Up @@ -6133,7 +6139,7 @@ definitions:
type: array
items:
$ref: '#/definitions/Milestone'

MilestoneTemplateRequest:
title: Milestone template request object
type: object
Expand Down
7 changes: 7 additions & 0 deletions migrations/20212201_project_terms_update_type.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- UPDATE EXISTING projects table
-- modify column `terms`

-- drop existent column first to avoid any issues during type convertion as we don't need the data if there is any
ALTER TABLE projects DROP COLUMN "terms";
-- now create a column with a new type
ALTER TABLE projects ADD COLUMN "terms" character varying(255)[] NOT NULL DEFAULT ARRAY[]::character varying[]::character varying(255)[];
4 changes: 4 additions & 0 deletions migrations/20212401_project_add_groups_field.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- UPDATE EXISTING projects table
-- add column `groups`

ALTER TABLE projects ADD COLUMN "groups" character varying(255)[] NOT NULL DEFAULT ARRAY[]::character varying[]::character varying(255)[];
3 changes: 2 additions & 1 deletion src/events/projects/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ const projectPayloadSchema = Joi.object().keys({
id: Joi.number().integer().positive().required(),
createdAt: Joi.date().required(),
updatedAt: Joi.date().required(),
terms: Joi.array().items(Joi.number().positive()).optional(),
terms: Joi.array().items(Joi.string()).optional(),
groups: Joi.array().items(Joi.string()).optional(),
name: Joi.string().required(),
description: Joi.string().allow(null).allow('').optional(),
type: Joi.string().max(45).required(),
Expand Down
7 changes: 6 additions & 1 deletion src/models/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ module.exports = function defineProject(sequelize, DataTypes) {
estimatedPrice: { type: DataTypes.DECIMAL(10, 2), allowNull: true },
actualPrice: { type: DataTypes.DECIMAL(10, 2), allowNull: true },
terms: {
type: DataTypes.ARRAY(DataTypes.INTEGER),
type: DataTypes.ARRAY(DataTypes.STRING),
allowNull: false,
defaultValue: [],
},
groups: {
type: DataTypes.ARRAY(DataTypes.STRING),
allowNull: false,
defaultValue: [],
},
Expand Down
3 changes: 2 additions & 1 deletion src/routes/projects/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const createProjectValidations = {
})).optional().allow(null),
estimatedPrice: Joi.number().precision(2).positive().optional()
.allow(null),
terms: Joi.array().items(Joi.number().positive()).optional(),
terms: Joi.array().items(Joi.string()).optional(),
groups: Joi.array().items(Joi.string()).optional(),
external: Joi.object().keys({
id: Joi.string(),
type: Joi.any().valid('github', 'jira', 'asana', 'other'),
Expand Down
3 changes: 2 additions & 1 deletion src/routes/projects/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ const updateProjectValdiations = {
status: Joi.any().valid(_.values(PROJECT_STATUS)),
estimatedPrice: Joi.number().precision(2).positive().allow(null),
actualPrice: Joi.number().precision(2).positive(),
terms: Joi.array().items(Joi.number().positive()),
terms: Joi.array().items(Joi.string()),
groups: Joi.array().items(Joi.string()),
external: Joi.object().keys({
id: Joi.string(),
type: Joi.any().valid('github', 'jira', 'asana', 'other'),
Expand Down
4 changes: 2 additions & 2 deletions src/routes/projects/update.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ describe('Project', () => {
Authorization: `Bearer ${testUtil.jwts.admin}`,
})
.send({
terms: [1, 2, 3],
terms: ['1', '2', '3'],
})
.expect(200)
.end((err) => {
Expand All @@ -996,7 +996,7 @@ describe('Project', () => {
createEventSpy.calledWith(BUS_API_EVENT.PROJECT_UPDATED, sinon.match({
resource: 'project',
id: project1.id,
terms: [1, 2, 3],
terms: ['1', '2', '3'],
updatedBy: testUtil.userIds.admin,
})).should.be.true;

Expand Down
5 changes: 4 additions & 1 deletion src/utils/es-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,10 @@ MAPPINGS[ES_PROJECT_INDEX] = {
index: 'not_analyzed',
},
terms: {
type: 'integer',
type: 'string',
},
groups: {
type: 'string',
},
type: {
type: 'string',
Expand Down