discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

fix-reacted

Browse Source
This commit is contained in:
tonyrewin 2022-08-14 06:07:11 +03:00
parent aba5e11522
commit f9c1c20ae4
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -145,4 +145,5 @@ migration/content/**/*.md
.DS_Store .DS_Store
dump dump
.vscode .vscode
*.sql *.sql
*.csv

14
migration/__init__.py
View File

@ -1,10 +1,12 @@
''' cmd managed migration ''' ''' cmd managed migration '''
import csv
from datetime import datetime from datetime import datetime
import json import json
import subprocess import subprocess
import sys import sys
import os import os
import bs4
import numpy as np
# from export import export_email_subscriptions # from export import export_email_subscriptions
from .export import export_mdx, export_slug from .export import export_mdx, export_slug
from orm.reaction import Reaction from orm.reaction import Reaction
@ -77,6 +79,8 @@ def shouts_handle(storage, args):
counter = 0 counter = 0
discours_author = 0 discours_author = 0
pub_counter = 0 pub_counter = 0
topics_dataset_bodies = []
topics_dataset_tlist = []
for entry in storage['shouts']['data']: for entry in storage['shouts']['data']:
# slug # slug
slug = get_shout_slug(entry) slug = get_shout_slug(entry)
@ -104,6 +108,14 @@ def shouts_handle(storage, args):
counter += 1 counter += 1
line = str(counter+1) + ': ' + shout['slug'] + " @" + author line = str(counter+1) + ': ' + shout['slug'] + " @" + author
print(line) print(line)
b = bs4.BeautifulSoup(shout['body'], 'html.parser')
texts = []
texts.append(shout['title'].lower().replace(r'[^а-яА-Яa-zA-Z]', ''))
texts = b.findAll(text=True)
topics_dataset_bodies.append(u" ".join([x.strip().lower() for x in texts]))
topics_dataset_tlist.append(shout['topics'])
np.savetxt('topics_dataset.csv', (topics_dataset_bodies, topics_dataset_tlist), delimiter=',', fmt='%s')
print('[migration] ' + str(counter) + ' content items were migrated') print('[migration] ' + str(counter) + ' content items were migrated')
print('[migration] ' + str(pub_counter) + ' have been published') print('[migration] ' + str(pub_counter) + ' have been published')

2
migration/tables/comments.py
View File

@ -91,7 +91,7 @@ def migrate(entry, storage):
# creating reaction from old rating # creating reaction from old rating
rr = Reaction.create(**re_reaction_dict) rr = Reaction.create(**re_reaction_dict)
day = (re_reaction_dict.get('createdAt') or ts).replace(hour=0, minute=0, second=0, microsecond=0) day = (re_reaction_dict.get('createdAt') or ts).replace(hour=0, minute=0, second=0, microsecond=0)
ReactedByDay.create(shout=rr.shout, reaction=rr.id, kind=rr.kind, day=day) ReactedByDay.create(shout=rr.shout, reaction=rr.id, kind=rr.kind, day=day, replyTo=reaction.id)
except Exception as e: except Exception as e:
print('[migration] comment rating error: %r' % re_reaction_dict) print('[migration] comment rating error: %r' % re_reaction_dict)

1
requirements.txt
View File

@ -1,4 +1,5 @@
frontmatter frontmatter
numpy
aioredis aioredis
ariadne ariadne
pyjwt>=2.0.0 pyjwt>=2.0.0

2
services/stat/reacted.py
View File

@ -13,7 +13,7 @@ class ReactedByDay(Base):
id = None id = None
reaction = Column(ForeignKey("reaction.id"), primary_key = True) reaction = Column(ForeignKey("reaction.id"), primary_key = True)
shout = Column(ForeignKey('shout.slug'), primary_key=True) shout = Column(ForeignKey('shout.slug'), primary_key=True)
reply = Column(ForeignKey('reaction.id'), nullable=True) replyTo = Column(ForeignKey('reaction.id'), nullable=True)
kind: int = Column(Enum(ReactionKind), nullable=False, comment="Reaction kind") kind: int = Column(Enum(ReactionKind), nullable=False, comment="Reaction kind")
day = Column(DateTime, primary_key=True, default=datetime.now) day = Column(DateTime, primary_key=True, default=datetime.now)