TODO-migration-fixed-topic-connection
This commit is contained in:
parent
e60e5691b3
commit
d4e456470e
|
@ -19,7 +19,7 @@ def load_email_templates():
|
||||||
filename = "templates/%s.tmpl" % name
|
filename = "templates/%s.tmpl" % name
|
||||||
with open(filename) as f:
|
with open(filename) as f:
|
||||||
email_templates[name] = f.read()
|
email_templates[name] = f.read()
|
||||||
print("all email templates loaded")
|
print("[email.service] templates loaded")
|
||||||
|
|
||||||
async def send_confirm_email(user):
|
async def send_confirm_email(user):
|
||||||
text = email_templates["confirm_email"]
|
text = email_templates["confirm_email"]
|
||||||
|
|
|
@ -29,6 +29,7 @@ def migrate(entry, topics_by_oid):
|
||||||
with local_session() as session:
|
with local_session() as session:
|
||||||
slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
|
slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
|
||||||
if slug:
|
if slug:
|
||||||
|
slug = retopics.get(slug, slug)
|
||||||
try:
|
try:
|
||||||
topic = session.query(Topic).filter(Topic.slug == slug).first()
|
topic = session.query(Topic).filter(Topic.slug == slug).first()
|
||||||
if not topic:
|
if not topic:
|
||||||
|
|
|
@ -263,9 +263,9 @@ def migrate(entry, users_by_oid, topics_by_oid):
|
||||||
shout_dict['topics'] = []
|
shout_dict['topics'] = []
|
||||||
for topic in r['topics']:
|
for topic in r['topics']:
|
||||||
try:
|
try:
|
||||||
ShoutTopic.create(**{ 'shout': s.slug, 'topic': topic['slug'] })
|
|
||||||
tpc = topics_by_oid[topic['oid']]
|
tpc = topics_by_oid[topic['oid']]
|
||||||
slug = retopics.get(tpc['slug'], tpc['slug'])
|
slug = retopics.get(tpc['slug'], tpc['slug'])
|
||||||
|
ShoutTopic.create(**{ 'shout': s.slug, 'topic': slug })
|
||||||
shout_dict['topics'].append(slug)
|
shout_dict['topics'].append(slug)
|
||||||
except sqlalchemy.exc.IntegrityError:
|
except sqlalchemy.exc.IntegrityError:
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -33,6 +33,7 @@ def migrate(entry, topics_by_oid):
|
||||||
retopics = json.loads(open('migration/tables/replacements.json').read())
|
retopics = json.loads(open('migration/tables/replacements.json').read())
|
||||||
with local_session() as session:
|
with local_session() as session:
|
||||||
slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
|
slug = topics_by_oid.get(topic_dict['oid'], topic_dict)['slug']
|
||||||
|
slug = retopics.get(slug, slug)
|
||||||
if slug:
|
if slug:
|
||||||
topic = session.query(Topic).filter(Topic.slug == slug).first()
|
topic = session.query(Topic).filter(Topic.slug == slug).first()
|
||||||
if not topic:
|
if not topic:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user