oppia · aks681 · Dec 10, 2018 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018
@@ -109,8 +109,17 @@ def get(self, question_id):
             raise self.PageNotFoundException(
                 'The question with the given id doesn\'t exist.')
 
+        associated_skill_ids = [link.skill_id for link in (
+            question_services.get_question_skill_links_of_question(
+                question_id))]
+        associated_skills = skill_services.get_multi_skills(
+            associated_skill_ids)
+        associated_skill_dicts = [
+            skill.to_dict() for skill in associated_skills]
+
         self.values.update({
-            'question_dict': question.to_dict()
+            'question_dict': question.to_dict(),
+            'associated_skill_dicts': associated_skill_dicts
         })
         self.render_json(self.values)
 
@@ -151,7 +160,7 @@ def put(self, question_id):
 
         question_dict = question_services.get_question_by_id(
             question_id).to_dict()
-        return self.render_json({
+        self.render_json({
             'question_dict': question_dict
         })
 

@@ -186,7 +186,7 @@ def get_question_skill_links_of_skill(skill_id):
     Returns:
         list(QuestionSkillLinkModel). The list of question skill link
         domain objects that are linked to the skill ID or an empty list
-         if the skill does not exist.
+        if the skill does not exist.
     """
 
     question_skill_link_models = (
@@ -196,6 +196,26 @@ def get_question_skill_links_of_skill(skill_id):
     return question_skill_link_models
 
 
+def get_question_skill_links_of_question(question_id):
+    """Returns a list of QuestionSkillLinkModels of
+    a particular question ID.
+
+    Args:
+        question_id: str. ID of the question.
+
+    Returns:
+        list(QuestionSkillLinkModel). The list of question skill link
+        domain objects that are linked to the question ID or an empty list
+        if the question does not exist.
+    """
+
+    question_skill_link_models = (
+        question_models.QuestionSkillLinkModel.get_models_by_question_id(
+            question_id)
+    )
+    return question_skill_link_models
+
+
 def update_skill_ids_of_questions(curr_skill_id, new_skill_id):
     """Updates the skill ID of QuestionSkillLinkModels to the superseding
     skill ID.
@@ -316,9 +336,9 @@ def apply_change_list(question_id, change_list):
                 if (change.property_name ==
                         question_domain.QUESTION_PROPERTY_LANGUAGE_CODE):
                     question.update_language_code(change.new_value)
-                elif (change.cmd ==
+                elif (change.property_name ==
                       question_domain.QUESTION_PROPERTY_QUESTION_STATE_DATA):
-                    question.update_question_data(change.new_value)
+                    question.update_question_state_data(change.new_value)
 
         return question
 

@@ -294,3 +294,38 @@ def test_created_question_rights(self):
             Exception, 'Entity for class QuestionRightsModel with id '
             'question_id not found'):
             question_services.get_question_rights('question_id')
+
+    def test_get_question_skill_links_of_question(self):
+        # If the question id doesnt exist at all, it returns an empty list.
+        question_skill_links = (
+            question_services.get_question_skill_links_of_question(
+                'non_existent_question_id'))
+        self.assertEqual(len(question_skill_links), 0)
+
+        question_id_2 = question_services.get_new_question_id()
+        self.save_new_question(
+            question_id_2, self.editor_id,
+            self._create_valid_question_data('ABC'))
+
+        question_id_3 = question_services.get_new_question_id()
+        self.save_new_question(
+            question_id_3, self.editor_id,
+            self._create_valid_question_data('ABC'))
+        question_services.create_new_question_skill_link(
+            self.question_id, 'skill_1')
+        question_services.create_new_question_skill_link(
+            question_id_2, 'skill_1')
+        question_services.create_new_question_skill_link(
+            question_id_2, 'skill_2')
+        question_services.create_new_question_skill_link(
+            question_id_3, 'skill_2')
+
+        question_skill_links = (
+            question_services.get_question_skill_links_of_question(
+                question_id_2))
+
+        self.assertEqual(len(question_skill_links), 2)
+        skill_ids = [question_skill.skill_id for question_skill
+                     in question_skill_links]
+        self.assertItemsEqual(
+            skill_ids, ['skill_1', 'skill_2'])
@@ -192,6 +192,22 @@ def get_multi_skill_summaries(skill_ids):
     return skill_summaries
 
 
+def get_multi_skills(skill_ids):
+    """Returns a list of skills matching the skill IDs provided.
+
+    Args:
+        skill_ids: list(str). List of skill IDs to get skills for.
+
+    Returns:
+        list(Skill). The list of skills matching the provided IDs.
+    """
+    local_skill_models = skill_models.SkillModel.get_multi(skill_ids)
+    skills = [
+        get_skill_from_model(skill_model)
+        for skill_model in local_skill_models]
+    return skills
+
+
 def get_skill_summary_from_model(skill_summary_model):
     """Returns a domain object for an Oppia skill summary given a
     skill summary model.

@@ -1114,7 +1114,8 @@ def validate(self, exp_param_specs_dict, allow_null_interaction):
         if not set(content_id_list) <= set(available_content_ids):
             raise utils.ValidationError(
                 'Expected state content_ids_to_audio_translations to have all '
-                'of the listed content ids %s' % content_id_list)
+                'of the listed content ids %s, found %s' %
+                (content_id_list, available_content_ids))
         if not isinstance(self.content_ids_to_audio_translations, dict):
             raise utils.ValidationError(
                 'Expected state content_ids_to_audio_translations to be a dict,'

@@ -246,6 +246,22 @@ def get_models_by_skill_id(cls, skill_id):
         return QuestionSkillLinkModel.query().filter(
             cls.skill_id == skill_id).fetch()
 
+    @classmethod
+    def get_models_by_question_id(cls, question_id):
+        """Returns a list of QuestionSkillLink domains of a particular
+        question ID.
+
+        Args:
+            question_id: str. ID of the question.
+
+        Returns:
+            list(QuestionSkillLinkModel)|None. The list of question skill link
+            domains that are linked to the question ID. None if the question
+            ID doesn't exist.
+        """
+        return QuestionSkillLinkModel.query().filter(
+            cls.question_id == question_id).fetch()
+
     @classmethod
     def put_multi_question_skill_links(cls, question_skill_links):
         """Puts multiple question skill links into the datastore.

diff --git a/core/templates/dev/head/domain/editor/undo_redo/UndoRedoService.js b/core/templates/dev/head/domain/editor/undo_redo/UndoRedoService.js
@@ -146,3 +146,127 @@ oppia.factory('UndoRedoService', [
     return UndoRedoService;
   }
 ]);
+
+// TODO(tjiang11): Figure out way to create new instance of service without
+// code duplication.
+oppia.factory('QuestionUndoRedoService', [
+  '$rootScope', 'EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED',
+  function($rootScope, EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED) {
+    var QuestionUndoRedoService = {};
+
+    var _appliedChanges = [];
+    var _undoneChanges = [];
+
+    var _dispatchMutation = function() {
+      $rootScope.$broadcast(EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED);
+    };
+    var _applyChange = function(changeObject, domainObject) {
+      changeObject.applyChange(domainObject);
+      _dispatchMutation();
+    };
+    var _reverseChange = function(changeObject, domainObject) {
+      changeObject.reverseChange(domainObject);
+      _dispatchMutation();
+    };
+
+    /**
+     * Pushes a change domain object onto the change stack and applies it to the
+     * provided domain object. When a new change is applied, all undone changes
+     * are lost and cannot be redone. This will fire an event as defined by the
+     * constant EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED.
+     */
+    QuestionUndoRedoService.applyChange = function(changeObject, domainObject) {
+      _applyChange(changeObject, domainObject);
+      _appliedChanges.push(changeObject);
+      _undoneChanges = [];
+    };
+
+    /**
+     * Undoes the last change to the provided domain object. This function
+     * returns false if there are no changes to undo, and true otherwise. This
+     * will fire an event as defined by the constant
+     * EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED.
+     */
+    QuestionUndoRedoService.undoChange = function(domainObject) {
+      if (_appliedChanges.length !== 0) {
+        var change = _appliedChanges.pop();
+        _undoneChanges.push(change);
+        _reverseChange(change, domainObject);
+        return true;
+      }
+      return false;
+    };
+
+    /**
+     * Reverses an undo for the given domain object. This function returns false
+     * if there are no changes to redo, and true if otherwise. This will fire an
+     * event as defined by the constant EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED.
+     */
+    QuestionUndoRedoService.redoChange = function(domainObject) {
+      if (_undoneChanges.length !== 0) {
+        var change = _undoneChanges.pop();
+        _appliedChanges.push(change);
+        _applyChange(change, domainObject);
+        return true;
+      }
+      return false;
+    };
+
+    /**
+     * Returns the current list of changes applied to the provided domain
+     * object. This list will not contain undone actions. Changes to the
+     * returned list will not be reflected in this service.
+     */
+    QuestionUndoRedoService.getChangeList = function() {
+      // TODO(bhenning): Consider integrating something like Immutable.js to
+      // avoid the slice here and ensure the returned object is truly an
+      // immutable copy.
+      return _appliedChanges.slice();
+    };
+
+    /**
+     * Returns a list of commit dict updates representing all chosen changes in
+     * this service. Changes to the returned list will not affect this service.
+     * Furthermore, the returned list is ready to be sent to the backend.
+     */
+    QuestionUndoRedoService.getCommittableChangeList = function() {
+      var committableChangeList = [];
+      for (var i = 0; i < _appliedChanges.length; i++) {
+        committableChangeList[i] = _appliedChanges[i].getBackendChangeObject();
+      }
+      return committableChangeList;
+    };
+
+    QuestionUndoRedoService.setChangeList = function(changeList) {
+      _appliedChanges = angular.copy(changeList);
+    };
+
+    /**
+     * Returns the number of changes that have been applied to the domain
+     * object.
+     */
+    QuestionUndoRedoService.getChangeCount = function() {
+      return _appliedChanges.length;
+    };
+
+    /**
+     * Returns whether this service has any applied changes.
+     */
+    QuestionUndoRedoService.hasChanges = function() {
+      return _appliedChanges.length !== 0;
+    };
+
+    /**
+     * Clears the change history. This does not reverse any of the changes
+     * applied from applyChange() or redoChange(). This will fire an event as
+     * defined by the constant EVENT_UNDO_REDO_SERVICE_CHANGE_APPLIED.
+     */
+    QuestionUndoRedoService.clearChanges = function() {
+      _appliedChanges = [];
+      _undoneChanges = [];
+      _dispatchMutation();
+    };
+
+    return QuestionUndoRedoService;
+  }
+]);
diff --git a/core/templates/dev/head/domain/exploration/InteractionObjectFactory.js b/core/templates/dev/head/domain/exploration/InteractionObjectFactory.js
@@ -59,6 +59,17 @@ oppia.factory('InteractionObjectFactory', [
       this.hints = newValue;
     };
 
+    Interaction.prototype.copy = function(otherInteraction) {
+      this.answerGroups = angular.copy(otherInteraction.answerGroups);
+      this.confirmedUnclassifiedAnswers =
+        angular.copy(otherInteraction.confirmedUnclassifiedAnswers);
+      this.customizationArgs = angular.copy(otherInteraction.customizationArgs);
+      this.defaultOutcome = angular.copy(otherInteraction.defaultOutcome);
+      this.hints = angular.copy(otherInteraction.hints);
+      this.id = angular.copy(otherInteraction.id);
+      this.solution = angular.copy(otherInteraction.solution);
+    };
+
     Interaction.prototype.toBackendDict = function() {
       return {
         answer_groups: this.answerGroups.map(function(answerGroup) {

diff --git a/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.js b/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.js
@@ -60,9 +60,12 @@ oppia.factory('EditableQuestionBackendApiService', [
         });
 
       $http.get(questionDataUrl).then(function(response) {
-        var questionDict = angular.copy(response.data.question_dict);
+        var data = angular.copy(response.data);
         if (successCallback) {
-          successCallback(questionDict);
+          successCallback({
+            question_dict: data.question_dict,
+            associated_skill_dicts: data.associated_skill_dicts
+          });
         }
       }, function(errorResponse) {
         if (errorCallback) {
@@ -82,7 +85,7 @@ oppia.factory('EditableQuestionBackendApiService', [
       var putData = {
         version: questionVersion,
         commit_message: commitMessage,
-        change_dicts: changeList
+        change_list: changeList
       };
       $http.put(editableQuestionDataUrl, putData).then(function(response) {
         // The returned data is an updated question dict.

diff --git a/core/templates/dev/head/domain/question/EditableQuestionBackendApiServiceSpec.js b/core/templates/dev/head/domain/question/EditableQuestionBackendApiServiceSpec.js
@@ -74,7 +74,8 @@ describe('Editable question backend API service', function() {
         },
         language_code: 'en',
         version: 1
-      }
+      },
+      associated_skill_dicts: []
     };
   }));
 
@@ -95,7 +96,7 @@ describe('Editable question backend API service', function() {
       $httpBackend.flush();
 
       expect(successHandler).toHaveBeenCalledWith(
-        sampleDataResults.question_dict);
+        sampleDataResults);
       expect(failHandler).not.toHaveBeenCalled();
     }
   );
@@ -126,11 +127,10 @@ describe('Editable question backend API service', function() {
         sampleDataResults);
 
       EditableQuestionBackendApiService.fetchQuestion('0').then(
-        function(questionDict) {
-          question = questionDict;
+        function(data) {
+          question = data.question_dict;
         });
       $httpBackend.flush();
-
       question.question_state_data.content.html = 'New Question Content';
       question.version = '2';
       var questionWrapper = {

diff --git a/core/templates/dev/head/domain/question/QuestionObjectFactory.js b/core/templates/dev/head/domain/question/QuestionObjectFactory.js
@@ -37,6 +37,10 @@ oppia.factory('QuestionObjectFactory', [
       return this._stateData;
     };
 
+    Question.prototype.setStateData = function(stateData) {
+      this._stateData.copy(stateData);
+    };
+
     Question.prototype.getLanguageCode = function() {
       return this._languageCode;
     };