Skip to content
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

Shapeup-pure-v5-task: adding phaseId support in older version #36

Merged
merged 4 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ workflows:
branches:
only:
- develop
- legacy_only
- feature/shapeup-pure-V5-task

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Topcoder - Legacy Submission Processor Application
# Topcoder - Legacy Submission Processor Application
----------------------

## Requirements
Expand Down
70 changes: 35 additions & 35 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,42 @@ echo "Creating lsp-asp images"
echo "================================"
docker-compose -f ecs-docker-compose.yml build --build-arg servername=${DB_SERVER_NAME} --build-arg port=${DB_SERVER_PORT} lsp-app
#docker tag lsp-app:latest $TAG
echo "================================"
echo "lsp-asp images has created"
echo "Creating kafka and tc-informix"
echo "================================"
docker-compose -f ecs-docker-compose.yml up -d kafka
echo "================================"
echo "kafka has created"
echo "Creating kafka and tc-informix"
echo "================================"
docker-compose -f ecs-docker-compose.yml up -d tc-informix
echo "================================"
echo "tc-informix has created"
echo "Executing kafka topics"
echo "================================"
sleep 5
docker exec -ti kafka bash -c "kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic submission.notification.create"
docker exec -ti kafka bash -c "kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic submission.notification.update"
echo "================================"
echo "kafka topics has created"
echo "Copying sql file and setting env"
echo "================================"
docker cp test/sql/test.sql iif_innovator_c:/
sleep 10
echo "================================"
echo "copied sql file "
echo "setting env"
echo "================================"
docker exec -ti iif_innovator_c bash -c "source /home/informix/ifx_informixoltp_tcp.env && dbaccess - /test.sql"
echo "================================"
echo "env set"
echo "initiating test"
echo "================================"
#echo "================================"
#echo "lsp-asp images has created"
#echo "Creating kafka and tc-informix"
#echo "================================"
#docker-compose -f ecs-docker-compose.yml up -d kafka
#echo "================================"
#echo "kafka has created"
#echo "Creating kafka and tc-informix"
#echo "================================"
#docker-compose -f ecs-docker-compose.yml up -d tc-informix
#echo "================================"
#echo "tc-informix has created"
#echo "Executing kafka topics"
#echo "================================"
#sleep 5
#docker exec -ti kafka bash -c "kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic submission.notification.create"
#docker exec -ti kafka bash -c "kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic submission.notification.update"
#echo "================================"
#echo "kafka topics has created"
#echo "Copying sql file and setting env"
#echo "================================"
#docker cp test/sql/test.sql iif_innovator_c:/
#sleep 10
#echo "================================"
#echo "copied sql file "
#echo "setting env"
#echo "================================"
#docker exec -ti iif_innovator_c bash -c "source /home/informix/ifx_informixoltp_tcp.env && dbaccess - /test.sql"
#echo "================================"
#echo "env set"
#echo "initiating test"
#echo "================================"
#docker-compose -f ecs-docker-compose.yml up --build lsp-app-test
echo "================================"
echo "test completed"
echo "================================"
#echo "================================"
#echo "test completed"
#echo "================================"
#docker build -f ECSDockerfile -t $TAG .

# Copies "node_modules" from the created image, if necessary for caching.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"http-json-response": "^1.0.1",
"ifxnjs": "^8.0.1",
"joi": "^13.4.0",
"legacy-processor-module": "git+https://github.com/topcoder-platform/legacy-processor-module.git#master",
"legacy-processor-module": "git+https://github.com/topcoder-platform/legacy-processor-module.git#0.0.3",
"lodash": "^4.17.14",
"moment": "^2.24.0",
"moment-timezone": "^0.5.26",
Expand Down
2 changes: 1 addition & 1 deletion src/services/SubmissionService.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const eventSchema = Schema.createEventSchema({
resource: Joi.resource(),
challengeId: Joi.id().required(),
memberId: Joi.id().required(),
submissionPhaseId: Joi.id().required(),
submissionPhaseId: Joi.sid().required(),
type: Joi.string().required(),
url: Joi.string()
.uri()
Expand Down