TODO-migration-fixed-topic-connection

migration/tables/content_item_categories.py

@@ -29,6 +29,7 @@ def migrate(entry, topics_by_oid):
 	with local_session() as session:
 		slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
 		if slug:
+			slug = retopics.get(slug, slug)
 			try:
 				topic = session.query(Topic).filter(Topic.slug == slug).first()
 				if not topic:

migration/tables/content_items.py

@@ -263,9 +263,9 @@ def migrate(entry, users_by_oid, topics_by_oid):
 			shout_dict['topics'] = []
 			for topic in r['topics']:
 				try:
-					ShoutTopic.create(**{ 'shout': s.slug, 'topic': topic['slug'] })
 					tpc = topics_by_oid[topic['oid']]
 					slug = retopics.get(tpc['slug'], tpc['slug'])
+					ShoutTopic.create(**{ 'shout': s.slug, 'topic': slug })
 					shout_dict['topics'].append(slug)
 				except sqlalchemy.exc.IntegrityError:
 					pass

migration/tables/tags.py

@@ -33,6 +33,7 @@ def migrate(entry, topics_by_oid):
 		retopics = json.loads(open('migration/tables/replacements.json').read())
 		with local_session() as session:
 			slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
+			slug = retopics.get(slug, slug)
 			if slug:
 				topic = session.query(Topic).filter(Topic.slug == slug).first()
 				if not topic: