implement the Forking this Concept and mapping

Author: hao555sky

django-nonrel/ocl/collection/models.py

@@ -87,24 +87,17 @@ def get_concept_id_by_version_information(self, expression):
             return Concept.objects.get(uri=expression).id
 
     def validate(self, ref, expression):
-        print 'collection/models.py validate ref: ', ref
-        print 'collection/models.py validate expression: ', expression
         ref.full_clean()
 
         drop_version = CollectionReferenceUtils.drop_version
-        print 'collection/models.py validate self.references: ', self.references
         if drop_version(ref.expression) in [drop_version(reference.expression) for reference in self.references]:
-            print 'collection/models.py validate ref.expression: ', ref.expression
-            print 'collection/models.py validate drop_version ref.expression: ', drop_version(ref.expression)
             raise ValidationError({expression: [REFERENCE_ALREADY_EXISTS]})
 
         if self.custom_validation_schema == CUSTOM_VALIDATION_SCHEMA_OPENMRS:
             if len(ref.concepts) < 1:
-                print 'collection/models.py validate expression: < 1 return'
                 return
 
             concept = ref.concepts[0]
-            print 'collection/models.py validate concept: ', concept
             self.check_concept_uniqueness_in_collection_and_locale_by_name_attribute(concept, attribute='is_fully_specified', value=True,
                                                                                      error_message=CONCEPT_FULLY_SPECIFIED_NAME_UNIQUE_PER_COLLECTION_AND_LOCALE)
             self.check_concept_uniqueness_in_collection_and_locale_by_name_attribute(concept, attribute='locale_preferred', value=True,
@@ -114,37 +107,24 @@ def check_concept_uniqueness_in_collection_and_locale_by_name_attribute(self, co
         from concepts.models import Concept, ConceptVersion
         matching_names_in_concept = dict()
 
-        print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute'
-        print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute concept: ', concept
-        print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute attribute: ', attribute
-        print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute value: ', value
-        print '\n'
-
         for name in [n for n in concept.names if getattr(n, attribute) == value]:
-            print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute name: ', name
             validation_error = {'names': [error_message]}
             # making sure names in the submitted concept meet the same rule
             name_key = name.locale + name.name
             if name_key in matching_names_in_concept:
-                print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute name_key: ', name_key
-                print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute matching_names_in_concept: ', matching_names_in_concept
                 raise ValidationError(validation_error)
 
             matching_names_in_concept[name_key] = True
 
             other_concepts_in_collection = list(ConceptVersion.objects.filter(uri__in=self.current_references()).values_list('id', flat=True))
 
-            print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute other_concepts_in_collection: ', other_concepts_in_collection
-
             if len(other_concepts_in_collection) < 1:
                 continue
 
             other_concepts_in_collection = list(map(ObjectId, other_concepts_in_collection))
-            print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute other_concepts_in_collection: ', other_concepts_in_collection
 
             same_name_and_locale = {'_id': {'$in': other_concepts_in_collection},
                                     'names': {'$elemMatch': {'name': name.name, 'locale': name.locale}}}
-            print 'collection/models.py check_concept_uniqueness_in_collection_and_locale_by_name_attribute same_name_and_locale: ', same_name_and_locale
 
             if ConceptVersion.objects.raw_query(same_name_and_locale).count() > 0:
                 raise ValidationError(validation_error)
@@ -446,27 +426,16 @@ class CollectionReferenceUtils():
     @classmethod
     def get_all_related_mappings(cls, expressions, collection):
 
-        print 'CollectionReferenceUtils get_all_related_mappings'
-        print 'CollectionReferenceUtils get_all_related_mappings expressions:  ', expressions
-        print 'CollectionReferenceUtils get_all_related_mappings collection: ', collection
-
         all_related_mappings = []
         unversioned_mappings = concept_expressions = []
 
         for expression in expressions:
-            print 'CollectionReferenceUtils get_all_related_mappings expression:  ', expression
             if cls.is_mapping(expression):
                 unversioned_mappings.append(cls.drop_version(expression))
-                print 'CollectionReferenceUtils get_all_related_mappings unversioned_mappings111:  ', unversioned_mappings
             elif cls.is_concept(expression):
                 concept_expressions.append(expression)
-                print 'CollectionReferenceUtils get_all_related_mappings concept_expressions111:  ', concept_expressions
-
-        print 'CollectionReferenceUtils get_all_related_mappings unversioned_mappings222:  ', unversioned_mappings
-        print 'CollectionReferenceUtils get_all_related_mappings concept_expressions222:  ', concept_expressions
 
         for concept_expression in concept_expressions:
-            print 'CollectionReferenceUtils get_all_related_mappings concept_expression:  ', concept_expression
             ref = CollectionReference(expression=concept_expression)
             try:
                 collection.validate(ref, concept_expression)
@@ -492,8 +461,6 @@ def get_related_mappings(cls, expression, existing_unversioned_mappings):
 
     @classmethod
     def get_concept_id_by_version_information(cls, expression):
-        print 'collection/models.py CollectionReferenceUtils get_concept_id_by_version_information'
-        print 'collection/models.py CollectionReferenceUtils get_concept_id_by_version_information expression: ', expression
         if CollectionReference.version_specified(expression):
             return ConceptVersion.objects.get(uri=expression).versioned_object_id
         else:

django-nonrel/ocl/collection/views.py

@@ -101,29 +101,19 @@ class CollectionReferencesView(CollectionBaseView,
                                ):
     serializer_class = CollectionDetailSerializer
 
-    print 'CollectionReferencesView'
-
     def initialize(self, request, path_info_segment, **kwargs):
-        print 'CollectionReferencesView initialize'
-        print 'CollectionReferencesView initialize request: ', request
-        print 'CollectionReferencesView initialize path_info_segment: ', path_info_segment
-        print 'CollectionReferencesView initialize kwargs: ', kwargs
+
         if request.method in ['GET', 'HEAD']:
             self.permission_classes = (CanViewConceptDictionary,)
         else:
             self.permission_classes = (CanEditConceptDictionary,)
         super(CollectionReferencesView, self).initialize(request, path_info_segment, **kwargs)
 
     def get_level(self):
-        print 'CollectionReferencesView get_level'
         return 1
 
     def update(self, request, *args, **kwargs):
-        print 'CollectionReferencesView update'
-        print 'CollectionReferencesView update request: ', request
-        print 'CollectionReferencesView update request DATA: ', request.DATA
-        print 'CollectionReferencesView update args: ', args
-        print 'CollectionReferencesView update kwargs: ', kwargs
+
         if not self.parent_resource:
             return HttpResponse(status=status.HTTP_405_METHOD_NOT_ALLOWED)
 
@@ -139,16 +129,6 @@ def update(self, request, *args, **kwargs):
 
         adding_all = mapping_expressions == '*' or concept_expressions == '*'
 
-        print 'CollectionReferencesView update data: ', data
-        print 'CollectionReferencesView update expressions: ', expressions
-        print 'CollectionReferencesView update concept_expressions: ', concept_expressions
-        print 'CollectionReferencesView update mapping_expressions: ', mapping_expressions
-        print 'CollectionReferencesView update cascade_mappings_flag: ', cascade_mappings_flag
-        print 'CollectionReferencesView update cascade_mappings: ', cascade_mappings
-        print 'CollectionReferencesView update host_url: ', host_url
-        print 'CollectionReferencesView update adding_all: ', adding_all
-
-
         if adding_all:
             add_references.delay(
                 self.serializer_class, self.request.user, data, self.parent_resource, host_url, cascade_mappings
@@ -160,8 +140,6 @@ def update(self, request, *args, **kwargs):
             self.serializer_class, self.request.user, data, self.parent_resource, host_url, cascade_mappings
         )
 
-        print 'CollectionReferencesView update added_references: ', added_references
-
         all_expression = expressions + concept_expressions + mapping_expressions
 
         added_expression = [references.expression for references in added_references]
@@ -171,32 +149,22 @@ def update(self, request, *args, **kwargs):
 
         for expression in added_original_expression:
             response_item = self.create_response_item(added_expression, errors, expression)
-            print 'CollectionReferencesView update response_item: ', response_item
             if response_item:
                 response.append(response_item)
 
-        print 'CollectionReferencesView update all_expression: ', all_expression
-        print 'CollectionReferencesView update added_expression: ', added_expression
-        print 'CollectionReferencesView update added_original_expression: ', added_original_expression
-        print 'CollectionReferencesView update response: ', response
-
         return Response(response, status=status.HTTP_200_OK)
 
     def create_response_item(self, added_references, errors, expression):
-        print 'CollectionReferencesView create_response_item'
         adding_expression_failed = len(errors) > 0 and errors[0].has_key(expression)
         if adding_expression_failed:
             return self.create_error_message(errors, expression)
         return self.create_success_message(added_references, expression)
 
     def create_success_message(self, added_references, expression):
-        print 'CollectionReferencesView create_success_message'
         message = self.select_update_message(expression)
 
         references = filter(lambda reference: reference.startswith(expression), added_references)
 
-        print 'CollectionReferencesView create_success_message message: ', message
-        print 'CollectionReferencesView create_success_message references: ', references
         if len(references) < 1:
             return
 
@@ -207,24 +175,18 @@ def create_success_message(self, added_references, expression):
         }
 
     def create_error_message(self, errors, expression):
-        print 'CollectionReferencesView create_error_message'
         error_message = errors[0].get(expression, {})
-        print 'CollectionReferencesView create_error_message errors: ', errors
-        print 'CollectionReferencesView create_error_message error_message: ', error_message
-        print 'CollectionReferencesView create_error_message expression: ', expression
         return {
             'added': False,
             'expression': expression,
             'message': error_message
         }
 
     def retrieve(self, request, *args, **kwargs):
-        print 'CollectionReferencesView retrieve'
         self.serializer_class = CollectionReferenceSerializer
         return self.list(request, *args, **kwargs)
 
     def get_queryset(self):
-        print 'CollectionReferencesView get_queryset'
         search_query = self.request.QUERY_PARAMS.get('q', '')
         sort = self.request.QUERY_PARAMS.get('search_sort', 'ASC')
 
@@ -233,7 +195,6 @@ def get_queryset(self):
         return references if sort == 'ASC' else list(reversed(references))
 
     def destroy(self, request, *args, **kwargs):
-        print 'CollectionReferencesView destroy'
         if not self.parent_resource:
             return HttpResponse(status=status.HTTP_405_METHOD_NOT_ALLOWED)
 
@@ -253,17 +214,13 @@ def destroy(self, request, *args, **kwargs):
         return Response({'message': 'ok!'}, status=status.HTTP_200_OK)
 
     def get_related_mappings_with_version_information(self, cascade_mappings_flag, references):
-        print 'CollectionReferencesView get_related_mappings_with_version_information'
-        print 'CollectionReferencesView get_related_mappings_with_version_information references: ', references
+
         related_mappings = []
 
         for reference in references:
             if CollectionReferenceUtils.is_concept(reference):
                 concept_id = CollectionReferenceUtils.get_concept_id_by_version_information(reference)
                 related_mappings += Concept.objects.get(id=concept_id).get_unidirectional_mappings()
-                print 'CollectionReferencesView get_related_mappings_with_version_information concept_id: ', concept_id
-                print 'CollectionReferencesView get_related_mappings_with_version_information reference: ', reference
-                print 'CollectionReferencesView get_related_mappings_with_version_information related_mappings: ', related_mappings
 
         return self.get_version_information_of_related_mappings(related_mappings)
 
@@ -278,7 +235,6 @@ def get_version_information_of_related_mappings(self, related_mappings):
         return related_mappings_with_version
 
     def cascade_mapping_resolver(self, cascade_mappings_flag):
-        print 'CollectionReferencesView cascade_mapping_resolver'
         cascade_mappings_flag_resolver = {
             'none': False,
             'sourcemappings': True
@@ -287,7 +243,6 @@ def cascade_mapping_resolver(self, cascade_mappings_flag):
         return cascade_mappings_flag_resolver.get(cascade_mappings_flag.lower(), False)
 
     def select_update_message(self, expression):
-        print 'CollectionReferencesView select_update_message'
         adding_head_version = not CollectionReference.version_specified(expression)
 
         expression_parts = expression.split('/')
@@ -298,20 +253,14 @@ def select_update_message(self, expression):
 
         resource_name = expression_parts[6]
 
-        print 'CollectionReferencesView select_update_message adding_head_version: ', adding_head_version
-        print 'CollectionReferencesView select_update_message expression_parts: ', expression_parts
-        print 'CollectionReferencesView select_update_message resource_type: ', resource_type
-
         return self.version_added_message_by_type(resource_name, self.parent_resource.name, resource_type)
 
     def adding_to_head_message_by_type(self, resource_type):
-        print 'CollectionReferencesView adding_to_head_message_by_type'
         if resource_type == 'concepts':
             return HEAD_OF_CONCEPT_ADDED_TO_COLLECTION
         return HEAD_OF_MAPPING_ADDED_TO_COLLECTION
 
     def version_added_message_by_type(self, resource_name, collection_name, resource_type):
-        print 'CollectionReferencesView version_added_message_by_type'
         if resource_type == 'concepts':
             return CONCEPT_ADDED_TO_COLLECTION_FMT.format(resource_name, collection_name)
         return MAPPING_ADDED_TO_COLLECTION_FMT.format(resource_name, collection_name)

django-nonrel/ocl/concepts/models.py

@@ -529,12 +529,3 @@ def propagate_parent_attributes(sender, instance=None, created=False, **kwargs):
                 concept_version.save()
             concept.save()
 
-
-class ConceptUtils():
-
-    @classmethod
-    def get_concept_id_by_version_information(cls, expression):
-        print 'concept/models.py ConceptUtils get_concept_id_by_version_information'
-        print 'concept/models.py ConceptUtils get_concept_id_by_version_information expression: ', expression
-
-        return Concept.objects.get(uri=expression).id

django-nonrel/ocl/concepts/views.py

@@ -12,7 +12,7 @@
 from collection.models import Collection, CollectionVersion, CollectionReference, CollectionReferenceUtils
 
 from concepts.filters import LimitSourceVersionFilter, PublicConceptsSearchFilter, LimitCollectionVersionFilter
-from concepts.models import Concept, ConceptVersion, LocalizedText, ConceptUtils
+from concepts.models import Concept, ConceptVersion, LocalizedText
 from concepts.permissions import CanViewParentDictionary, CanEditParentDictionary
 from concepts.serializers import (ConceptDetailSerializer, ConceptVersionListSerializer,
                                   ConceptVersionDetailSerializer, ConceptVersionUpdateSerializer,
@@ -162,8 +162,6 @@ def get_queryset(self):
 class ConceptCreateView(ConceptBaseView,
                         mixins.CreateModelMixin):
 
-    print 'ConceptCreateView'
-
     @csrf_exempt
     def dispatch(self, request, *args, **kwargs):
         if request.method != 'POST':
@@ -199,7 +197,6 @@ def create(self, request, *args, **kwargs):
 
 class ConceptForkView(ConceptBaseView,
                         mixins.CreateModelMixin):
-    print 'ConceptForkView'
 
     @csrf_exempt
     def dispatch(self, request, *args, **kwargs):
@@ -216,20 +213,6 @@ def post(self, request, *args, **kwargs):
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.DATA, files=request.FILES)
 
-        print 'ConceptForkView create: request Data:   ', request.DATA
-        print 'ConceptForkView create: request args:  ', args
-        print 'ConceptForkView create: request kwargs: ', kwargs
-
-        fork_mappings = request.DATA.get('Fork_Mappings')
-        concept_id = ConceptUtils.get_concept_id_by_version_information(request.DATA.get('forked_from_url'))
-        related_mappings = self.get_related_mappings_with_version_information(concept_id)
-
-        print 'ConceptForkView create: request concept_id:     ', concept_id
-        print 'ConceptForkView create: request fork_mappings:   ', fork_mappings
-        print 'ConceptForkView create: request related_mappings: ', related_mappings
-
-        # return None
-
         if serializer.is_valid():
             self.pre_save(serializer.object)
             save_kwargs = {
@@ -248,16 +231,6 @@ def create(self, request, *args, **kwargs):
 
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def validate(self):
-        queryset = ConceptVersion.objects.filter(is_active=True)
-        print 'ConceptForkView queryset:   ', queryset
-
-    def get_related_mappings_with_version_information(self, concept_id):
-        print 'ConceptForkView get_related_mappings_with_version_information'
-        related_mappings = []
-        related_mappings += Concept.objects.get(id=concept_id).get_unidirectional_mappings()
-        return related_mappings
-
 
 class ConceptVersionsView(ConceptDictionaryMixin, ListWithHeadersMixin):
     serializer_class = ConceptVersionListSerializer
@@ -352,8 +325,6 @@ class ConceptVersionRetrieveView(ConceptVersionMixin, ResourceVersionMixin, Retr
     permission_classes = (CanViewParentDictionary,)
     versioned_object = None
 
-    print 'ConceptVersionRetrieveView'
-
     def initialize(self, request, path_info_segment, **kwargs):
         self.versioned_object = kwargs.pop('versioned_object', None)
         super(ConceptVersionRetrieveView, self).initialize(request, path_info_segment, **kwargs)