Refactored code for getting existing and new global ids

boards/models/post/__init__.py

@@ -127,15 +127,13 b' class PostManager(models.Manager):'
 
     @transaction.atomic
     def import_post(self, title: str, text:str, pub_time: str,
-                    opening_post=None):
+                    opening_post=None, tags=list()):
         if opening_post is None:
             thread = boards.models.thread.Thread.objects.create(
                 bump_time=pub_time, last_edit_time=pub_time)
-            # list(map(thread.tags.add, tags))
-            new_thread = True
+            list(map(thread.tags.add, tags))
         else:
             thread = opening_post.get_thread()
-            new_thread = False
 
         post = Post.objects.create(title=title, text=text,
                                    pub_time=pub_time,

boards/models/post/sync.py

@@ -97,32 +97,32 b' class SyncManager:'
             for tag_model in tag_models:
                 tag_content = tag_model.find(TAG_CONTENT)
                 tag_id = tag_content.find(TAG_ID)
-                try:
-                    GlobalId.from_xml_element(tag_id, existing=True)
-                    print('Post with same ID already exists')
-                except GlobalId.DoesNotExist:
-                    global_id = GlobalId.from_xml_element(tag_id)
+                global_id, exists = GlobalId.from_xml_element(tag_id)
 
-                    if not GlobalId.objects.global_id_exists(global_id):
-                        global_id.save()
+                if exists:
+                    print('Post with same ID already exists')
+                else:
+                    global_id.save()
 
-                        title = tag_content.find(TAG_TITLE).text
-                        text = tag_content.find(TAG_TEXT).text
-                        pub_time = tag_content.find(TAG_PUB_TIME).text
+                    title = tag_content.find(TAG_TITLE).text
+                    text = tag_content.find(TAG_TEXT).text
+                    pub_time = tag_content.find(TAG_PUB_TIME).text
 
-                        # TODO Check that the replied posts are already present
-                        # before adding new ones
-
-                        # TODO thread, tags
+                    thread = tag_content.find(TAG_THREAD)
+                    if thread:
+                        opening_post = Post.objects.get(
+                            id=thread.find(TAG_ID).text)
+                        # TODO Get tags here
+                    else:
+                        opening_post = None
 
-                        # FIXME This prints are for testing purposes only, they must
-                        # be removed after sync is implemented
-                        print(title)
-                        print(text)
+                    # TODO Check that the replied posts are already present
+                    # before adding new ones
 
-                        post = Post.objects.import_post(title=title, text=text,
-                                                        pub_time=pub_time)
-                        post.global_id = global_id
+                    post = Post.objects.import_post(
+                        title=title, text=text, pub_time=pub_time,
+                        opening_post=opening_post)
+                    post.global_id = global_id
         else:
             # TODO Throw an exception?
             pass

boards/models/signature.py

@@ -78,26 +78,28 b' class GlobalId(models.Model):'
         element.set(ATTR_LOCAL_ID, str(self.local_id))
 
     @staticmethod
-    def from_xml_element(element: et.Element, existing=False):
+    def from_xml_element(element: et.Element):
         """
         Parses XML id tag and gets global id from it.
 
         Arguments:
         element -- the XML 'id' element
-        existing -- if this is False, a new instance of GlobalId will be
-         created. Otherwise, we will search for an existing GlobalId instance
-         and throw DoesNotExist if there isn't one.
+
+        Returns:
+        global_id -- id itself
+        exists -- True if the global id was taken from database, False if it
+        did not exist and was created.
         """
 
-        if existing:
+        try:
             return GlobalId.objects.get(key=element.get(ATTR_KEY),
                                         key_type=element.get(ATTR_KEY_TYPE),
                                         local_id=int(element.get(
-                                            ATTR_LOCAL_ID)))
-        else:
+                                            ATTR_LOCAL_ID))), True
+        except GlobalId.DoesNotExist:
             return GlobalId(key=element.get(ATTR_KEY),
                             key_type=element.get(ATTR_KEY_TYPE),
-                            local_id=int(element.get(ATTR_LOCAL_ID)))
+                            local_id=int(element.get(ATTR_LOCAL_ID))), False
 
 
 class Signature(models.Model):

boards/views/sync.py

@@ -24,13 +24,9 b' def response_get(request):'
     root_tag = et.fromstring(request_xml)
     model_tag = root_tag[0]
     for id_tag in model_tag:
-        try:
-            global_id = GlobalId.from_xml_element(id_tag, existing=True)
+        global_id, exists = GlobalId.from_xml_element(id_tag)
+        if exists:
             posts.append(Post.objects.get(global_id=global_id))
-        except GlobalId.DoesNotExist:
-            # This is normal. If we don't have such GlobalId in the system,
-            # just ignore this ID and proceed to the next one.
-            pass
 
     response_xml = SyncManager().generate_response_get(posts)