Merge pull request #533 from coding-blocks/polymorphic_problem

Polymorphic problem

Author: jatinkatyal13

app/models/code-challenge.js

@@ -4,7 +4,7 @@ import env from 'codingblocks-online/config/environment'
 
 export default DS.Model.extend({
     name: DS.attr(),
-    hbProblemId: DS.attr(),
+    hbContentId: DS.attr(),
     content: DS.belongsTo('content'),
     testcases: DS.hasMany('testcase')
 })

app/models/problem-leaderboard.js app/models/content-leaderboard.jsapp/models/problem-leaderboard.js renamed to app/models/content-leaderboard.js

@@ -1,7 +1,4 @@
 import DS from "ember-data";
-import { computed } from '@ember/object'
-import { isValidResult, isPassedTestcase } from "codingblocks-online/utils/testcases";
-import { pipe, not } from "codingblocks-online/utils/functional";
 
 export default DS.Model.extend({
   language: DS.attr(),

app/models/problem.js

@@ -3,7 +3,7 @@ import { computed } from '@ember/object';
 
 export default DS.Model.extend({
   name: DS.attr(),
-  content: DS.attr(),
+  details: DS.attr(),
   submissions: DS.hasMany('submission'),
   solutionStubs: DS.hasMany('solution-stub'),
   mostSuccessfullSubmission: computed('submissions', function(){

app/models/submission.js

@@ -6,7 +6,10 @@ import { pipe, not } from "codingblocks-online/utils/functional";
 export default DS.Model.extend({
   language: DS.attr(),
   score: DS.attr(),
-  source: DS.attr(),
+  solution: DS.attr(),
+  source: computed('solution', function () {
+    return this.solution.source
+  }),
   explanation: DS.attr(),
   'submit-at': DS.attr(),
   'judge-result': DS.attr(),

app/pods/attempt/content/code-challenge/route.js

@@ -12,17 +12,16 @@ export default class CodeChallengeRoute extends Route {
     const runAttempt = this.modelFor('attempt')
     this.set("api.headers.hackJwt", this.get("currentUser.user.hackJwt"));
 
-    const problem = this.api.request('code_challenges/problems', {
+    const problem = this.api.request(`code_challenges/${content.payload.get('id')}/problem`, {
       data: {
-        contest_id: runAttempt.get("run.contestId"),
-        problem_id: content.payload.get("hbProblemId")
+        contest_id: runAttempt.get("run.contestId")
       }
     }).then(payload => {
       if (!payload) return {}
 
       this.store.unloadAll('problem')
       this.store.pushPayload(payload)
-      return this.store.peekRecord('problem', content.payload.get('hbProblemId'))
+      return this.store.peekRecord('problem', payload.data.id)
     }).catch(err => {
       console.log(err)
       return {}

app/pods/attempt/content/code-challenge/template.hbs

@@ -31,7 +31,7 @@
       </div>
 
       Contest ID: {{runAttempt.run.contestId}} <br>
-      Problem ID: {{codeChallenge.hbProblemId}} <br>
+      Problem ID: {{codeChallenge.hbContentId}} <br>
       Run ID: {{runAttempt.run.id}} <br>
       Run Attempt ID: {{runAttempt.id}}
     </div>

app/pods/components/code-challenge/code-challenge-code-editor/component.js

@@ -129,7 +129,7 @@ export default class CodeEditor extends Component {
     const payload = yield this.api.request("code_challenges/submit", {
       method: "POST",
       data: {
-        problemId: this.codeChallenge.get("hbProblemId"),
+        contentId: this.codeChallenge.get("hbContentId"),
         custom_input: Base64.encode(this.customInputText),
         source: Base64.encode(this.selectedLanguage.source),
         language: this.selectedLanguage.code,
@@ -151,7 +151,7 @@ export default class CodeEditor extends Component {
       method: "POST",
       data: {
         contestId: runAttempt.get("run.contestId"),
-        problemId: this.codeChallenge.get("hbProblemId"),
+        contentId: this.codeChallenge.get("hbContentId"),
         language: this.selectedLanguage.code,
         source: Base64.encode(this.selectedLanguage.source)
       }
@@ -162,21 +162,19 @@ export default class CodeEditor extends Component {
       "method": "GET"
     }), submissionStatus => submissionStatus && submissionStatus['judge-result'] !== null);
 
-    this.get('api').request('code_challenges/problems',{
+    this.get('api').request(`code_challenges/${this.codeChallenge.get('id')}/problems`,{
       data: {
-        contest_id: runAttempt.get("run.contestId"),
-        problem_id: this.codeChallenge.get("hbProblemId")
+        contest_id: runAttempt.get("run.contestId")
       },
     }).then(async result=>{
       this.set("problemJsonApiPayload", result);
       const payload = JSON.parse(JSON.stringify(result))
       this.get('store').unloadAll('problem')
       later(async() => {
         this.get('store').pushPayload(payload)
-        const problem = await this.get('store').peekRecord('problem', this.codeChallenge.get('hbProblemId'))
+        const problem = await this.get('store').peekRecord('problem', result.data.id)
         if (await problem.get('hasLatestSubmissionPassed') && await problem.get('mostSuccessfullSubmission.score') == 100) {
           const progress = await this.get('content.progress')
-          debugger
           progress.set("status", 'DONE')
           return progress.save();
         }

app/pods/components/code-challenge/code-challenge-explanation/template.hbs

@@ -1,31 +1,31 @@
 <p>
-  {{markdown-to-html problem.content.description}}
+  {{markdown-to-html problem.details.description}}
 </p>
 <div class="extra-bold">Input Format</div>
 <p>
-  {{markdown-to-html problem.content.input-format}}
+  {{markdown-to-html problem.details.input-format}}
 </p>
 <div class="extra-bold">Constraints</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
   <p>
-    {{markdown-to-html problem.content.constraints}}
+    {{markdown-to-html problem.details.constraints}}
   </p>
 </div>
 <div class="extra-bold">Output Format</div>
 <p>
-  {{markdown-to-html problem.content.output-format}}
+  {{markdown-to-html problem.details.output-format}}
 </p>
 <div class="extra-bold">Sample Input</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
-  <pre>{{problem.content.sample-input}}</pre>
+  <pre>{{problem.details.sample-input}}</pre>
 </div>
 <div class="extra-bold">Sample Output</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
-  <pre>{{problem.content.sample-output}}</pre>
+  <pre>{{problem.details.sample-output}}</pre>
 </div>
-{{#if problem.content.explanation}}
+{{#if problem.details.explanation}}
   <div class="extra-bold">Explanation</div>
   <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
-    {{markdown-to-html problem.content.explanation}}
+    {{markdown-to-html problem.details.explanation}}
   </div>
 {{/if}}

app/pods/components/code-challenge/code-challenge-leaderboard/component.js

@@ -10,16 +10,19 @@ export default class LeaderboardComponent extends Component {
 
   @restartableTask fetchLeaderboardTask = function *() {
     const runAttempt = this.store.peekRecord('run-attempt', this.player.runAttemptId)
-    yield this.hbApi.request('submissions/leaderboard', {
+    yield this.hbApi.request('content-leaderboards', {
       data: {
-        contest_id: runAttempt.get("run.contestId"),
-        problem_id: this.codeChallenge.get("hbProblemId")
+        filter: {
+          contestId: runAttempt.get("run.contestId"),
+          contentId: this.codeChallenge.get("hbContentId")
+        },
+        include: 'user,college'
       }
     }).then(result => {
-      this.store.unloadAll('problem-leaderboard')
+      this.store.unloadAll('content-leaderboard')
       later(() => {
         this.store.pushPayload(result)
-        this.set('leaderboard', this.get('store').peekAll('problem-leaderboard'))
+        this.set('leaderboard', this.get('store').peekAll('content-leaderboard'))
       })
     })
   }

app/pods/components/code-challenge/code-challenge-solution/component.js

@@ -23,7 +23,7 @@ export default class CodeChallengeSolution extends Component {
         type: "GET",
         data: {
           contest_id: runAttempt.run.get("contestId"),
-          p_id: this.codeChallenge.get('hbProblemId')
+          p_id: this.problem.get('id')
         }
       }
     );
@@ -38,7 +38,7 @@ export default class CodeChallengeSolution extends Component {
       type: "GET",
       data: {
         contest_id: runAttempt.run.get("contestId"),
-        p_id: this.codeChallenge.get('hbProblemId')
+        p_id: this.problem.get('id')
       }
     })
     return testcasesPayload.data.map(t => ({
@@ -52,7 +52,7 @@ export default class CodeChallengeSolution extends Component {
     this.set('api.headers.hackJwt', this.get('currentUser.user.hackJwt'))
     yield this
       .get("api")
-      .request(`code_challenges/`+ which +`?contest_id=${runAttempt.run.get("contestId")}&p_id=${this.codeChallenge.get("hbProblemId")}&force=true`)
+      .request(`code_challenges/`+ which +`?contest_id=${runAttempt.run.get("contestId")}&p_id=${this.problem.get("id")}&force=true`)
 
     return (which === 'editorials' ? this.fetchEditorialTask : this.fetchTestcaseTask).perform()
   }