Do constrain on content_type on old State system, but make sure we're

using the old content type
 - Legacy-Id: 3832

Author: OleLaursen

redesign/importing/import-docs.py

@@ -773,6 +773,8 @@ def import_from_idinternal(d, idinternal):
 #all_drafts = all_drafts[all_drafts.count() - 1000:]
 #all_drafts = all_drafts.none()
 
+old_internetdraft_content_type_id = ContentType.objects.using("legacy").get(app_label="idtracker", model="internetdraft").pk
+
 for index, o in enumerate(all_drafts.iterator()):
     print "importing", o.id_document_tag, o.filename, index, "ballot %s" % o.idinternal.ballot_id if o.idinternal and o.idinternal.ballot_id else ""
 
@@ -807,9 +809,8 @@ def import_from_idinternal(d, idinternal):
 
     d.unset_state("draft-iesg")
     try:
-        # don't constrain on content type, it may be broken because of
-        # the two databases in uses
-        s = StateOld.objects.get(stateobjectrelation__content_id=o.pk)
+        s = StateOld.objects.get(stateobjectrelation__content_type=old_internetdraft_content_type_id,
+                                 stateobjectrelation__content_id=o.pk)
     except StateOld.DoesNotExist:
         s = None