Unverified Commit e86f33e2 authored by Kartheek Palla's avatar Kartheek Palla Committed by GitHub
Browse files

Merge pull request #174 from ahghatol/fix

Issue #SB-000 fix: Added missing cols
parents a3d62280 1e216cfc
SB-23374 SB-25924 copy_issue copy_issue1 dependabot/npm_and_yarn/src/ajv-6.12.6 dependabot/npm_and_yarn/src/async-2.6.4 dependabot/npm_and_yarn/src/axios-0.21.2 dependabot/npm_and_yarn/src/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/lodash-4.17.21 dependabot/npm_and_yarn/src/moment-2.29.4 dependabot/npm_and_yarn/src/moment-timezone-0.5.37 dependabot/npm_and_yarn/src/node-fetch-2.6.7 dependabot/npm_and_yarn/src/pathval-1.1.1 dependabot/npm_and_yarn/src/qs-and-body-parser-and-express-6.5.3 dependabot/npm_and_yarn/src/redis-3.1.1 dependabot/npm_and_yarn/src/simple-get-2.8.2 dependabot/npm_and_yarn/src/underscore-1.12.1 log_issue master questionset-integration release-4.1.0 release-4.1.1 release-4.2.0 release-4.3.0 release-4.4.0 release-4.5.0 release-4.6.0 release-4.7.0 release-4.8.0 release-4.9.0 release-5.1.0 sb-22518 test-issue vk-local-ps-4.4.0 release-5.1.0_RC1 release-4.9.0_RC1 release-4.8.0_RC3 release-4.8.0_RC2 release-4.8.0_RC1 release-4.7.0_RC6 release-4.7.0_RC5 release-4.7.0_RC4 release-4.7.0_RC3 release-4.7.0_RC2 release-4.7.0_RC1 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC1 release-4.4.0_RC5 release-4.4.0_RC4 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.3.0_RC5 release-4.3.0_RC4 release-4.3.0_RC3 release-4.3.0_RC2 release-4.3.0_RC1 release-4.2.0_RC9 release-4.2.0_RC8 release-4.2.0_RC7 release-4.2.0_RC6 release-4.2.0_RC5 release-4.2.0_RC4 release-4.2.0_RC3 release-4.2.0_RC2 release-4.2.0_RC1 release-4.1.1_RC1 release-4.1.0_RC2 release-4.1.0_RC1
No related merge requests found
Showing with 15 additions and 6 deletions
+15 -6
......@@ -26,6 +26,10 @@ CREATE TABLE program
createdon timestamp with time zone DEFAULT timezone('utc'::text, now()),
updatedby character varying COLLATE pg_catalog."default",
updatedon timestamp with time zone DEFAULT timezone('utc'::text, now()),
targetprimarycategories text[],
targetprimarycategorynames text[],
guidelines_url text,
rolemapping json,
CONSTRAINT pk_program_id PRIMARY KEY (program_id)
);
......@@ -46,10 +50,11 @@ CREATE TABLE nomination
createdon timestamp with time zone DEFAULT timezone('utc'::text, now()),
updatedby character varying COLLATE pg_catalog."default",
updatedon timestamp with time zone,
targetprimarycategories text[],
targetprimarycategorynames text[],
CONSTRAINT pk_id PRIMARY KEY (id)
);
CREATE SEQUENCE IF NOT EXISTS contentid_seq;
CREATE TYPE contenttypesenum AS ENUM ('TeachingMethod', 'PedagogyFlow', 'FocusSpot', 'LearningOutcomeDefinition', 'PracticeQuestionSet', 'CuriosityQuestionSet', 'MarkingSchemeRubric', 'ExplanationResource', 'ExperientialResource', 'ConceptMap', 'SelfAssess');
CREATE TABLE contenttypes (
......
......@@ -117,7 +117,7 @@ describe("Print Service", () => {
});
});
it("[Integration test] should return a PDF for correct Hierarchy ID", (done) => {
xit("[Integration test] should return a PDF for correct Hierarchy ID", (done) => {
pdf.buildPDFWithCallback(
"do_11326731857693900818",
(base64PDF, error, errorMsg) => {
......
......@@ -337,8 +337,10 @@ describe("Program Service", () => {
.send({
request: {
filters: {
enrolled_id: {
user_id: dummyData.nominationAdd.user_id,
nomination: {
user_id: {
eq: dummyData.nominationAdd.user_id
},
},
},
},
......@@ -629,8 +631,10 @@ describe("Program Service", () => {
.send({
request: {
filters: {
enrolled_id: {
user_id: "cca53828-8111-4d71-9c45-40e569f13bad",
nomination:{
user_id: {
eq: "cca53828-8111-4d71-9c45-40e569f13bad"
}
},
status: ["Live"],
medium: ["English"],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment