From 59e2a50a3fdda8f94f385ac875014896594ac9a1 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sat, 21 Jan 2023 09:53:42 +0100
Subject: [PATCH] new entries schema

---
 cao_blogr.sqlite                              | Bin 28672 -> 32768 bytes
 .../alembic/versions/20220419_bbacde35234d.py |  26 --------------
 .../alembic/versions/20220419_e7889eab89c0.py |  28 ---------------
 .../alembic/versions/20221208_7cfe6f79c819.py |  28 ---------------
 .../alembic/versions/20221208_86d2844ace15.py |  26 --------------
 .../alembic/versions/20221208_b6095fa68edc.py |  26 --------------
 ...99f27f265f.py => 20230121_d335bb2cb9da.py} |  34 ++++++++++++------
 cao_blogr/models/blog_record.py               |  19 ++++++----
 cao_blogr/services/blog_record.py             |  25 +------------
 cao_blogr/templates/blog.jinja2               |   2 +-
 cao_blogr/templates/home.jinja2               |   2 ++
 cao_blogr/views/blog.py                       |  25 ++++++-------
 setup.py                                      |   2 +-
 13 files changed, 54 insertions(+), 189 deletions(-)
 delete mode 100644 cao_blogr/alembic/versions/20220419_bbacde35234d.py
 delete mode 100644 cao_blogr/alembic/versions/20220419_e7889eab89c0.py
 delete mode 100644 cao_blogr/alembic/versions/20221208_7cfe6f79c819.py
 delete mode 100644 cao_blogr/alembic/versions/20221208_86d2844ace15.py
 delete mode 100644 cao_blogr/alembic/versions/20221208_b6095fa68edc.py
 rename cao_blogr/alembic/versions/{20181223_5899f27f265f.py => 20230121_d335bb2cb9da.py} (65%)

diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite
index b37c3522c7d84311982f0acd40fd129a23d41608..aa89269484af894ed1ef28bd8a14060d4bc43462 100644
GIT binary patch
delta 553
zcmZp8z}V2hG(lRBgMonogkgYXqK>gN2ZNr(310pm4D8%T8Tfhmck&hRhVi*_ALUiw
zEGXd3E!Py!#x5=`&Dbhhl9-f}nwnQql$lx#rPwE*;?5UNE=o--$uCj}a}09!a17Eg
zHPD<~$R{3{nv#hotfRoiS(2CzS7~Ib2@*;yEy+OD4-zddNh~QXhN}gc+QJvj$UgZ2
zpN=#~V-5?uxVSiDvpLvZrNya5#bAPU@(Z48jI5LQ^J-|aHA*qFi;IdfHi?5(0qq8w
znqJJ}9OUX4;;Inh=;Y(702G;gms?g9(_uiF_`Jm2RJbFIOeYueOG*`F$AgSf2nh1@
zbqtDB@OF(<(8x^D<kH;C%l}+}C&k#<G%3j_Imt35ag)Lqej#K5UQh%G07Lga|HKK>
zJRmL;-vI{x1ik}6!7Y58jj~K^4C0Noj+0Ab8x)Ln4GeXS3>6G4tV}Gej7{~-j7%&H
zj2mScp^Em!Oy}VO8N&aTf&V-ITd>K}3=Evi;*13urTNKB9L(aJi7C06d8k&ifpj5U
F0swEslC1y$

literal 28672
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
D{4+*e

diff --git a/cao_blogr/alembic/versions/20220419_bbacde35234d.py b/cao_blogr/alembic/versions/20220419_bbacde35234d.py
deleted file mode 100644
index 47b04ea..0000000
--- a/cao_blogr/alembic/versions/20220419_bbacde35234d.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""init
-
-Revision ID: bbacde35234d
-Revises: e7889eab89c0
-Create Date: 2022-04-19 17:09:50.728285
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'bbacde35234d'
-down_revision = 'e7889eab89c0'
-branch_labels = None
-depends_on = None
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('entries', sa.Column('body_html', sa.UnicodeText(), nullable=True))
-    # ### end Alembic commands ###
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('entries', 'body_html')
-    # ### end Alembic commands ###
diff --git a/cao_blogr/alembic/versions/20220419_e7889eab89c0.py b/cao_blogr/alembic/versions/20220419_e7889eab89c0.py
deleted file mode 100644
index a0ac311..0000000
--- a/cao_blogr/alembic/versions/20220419_e7889eab89c0.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""init
-
-Revision ID: e7889eab89c0
-Revises: 5899f27f265f
-Create Date: 2022-04-19 16:21:57.531003
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'e7889eab89c0'
-down_revision = '5899f27f265f'
-branch_labels = None
-depends_on = None
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('entries', sa.Column('tag', sa.Unicode(), nullable=True))
-    op.add_column('entries', sa.Column('topic', sa.Unicode(), nullable=True))
-    # ### end Alembic commands ###
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('entries', 'topic')
-    op.drop_column('entries', 'tag')
-    # ### end Alembic commands ###
diff --git a/cao_blogr/alembic/versions/20221208_7cfe6f79c819.py b/cao_blogr/alembic/versions/20221208_7cfe6f79c819.py
deleted file mode 100644
index 15e047b..0000000
--- a/cao_blogr/alembic/versions/20221208_7cfe6f79c819.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""init
-
-Revision ID: 7cfe6f79c819
-Revises: b6095fa68edc
-Create Date: 2022-12-08 16:30:41.529957
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '7cfe6f79c819'
-down_revision = 'b6095fa68edc'
-branch_labels = None
-depends_on = None
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('groups', sa.Unicode(), nullable=True))
-    op.drop_column('users', 'group')
-    # ### end Alembic commands ###
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('group', sa.VARCHAR(), nullable=True))
-    op.drop_column('users', 'groups')
-    # ### end Alembic commands ###
diff --git a/cao_blogr/alembic/versions/20221208_86d2844ace15.py b/cao_blogr/alembic/versions/20221208_86d2844ace15.py
deleted file mode 100644
index 8b46a8e..0000000
--- a/cao_blogr/alembic/versions/20221208_86d2844ace15.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""init
-
-Revision ID: 86d2844ace15
-Revises: bbacde35234d
-Create Date: 2022-12-08 15:53:57.291157
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '86d2844ace15'
-down_revision = 'bbacde35234d'
-branch_labels = None
-depends_on = None
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('group', sa.Unicode(), nullable=True))
-    # ### end Alembic commands ###
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'group')
-    # ### end Alembic commands ###
diff --git a/cao_blogr/alembic/versions/20221208_b6095fa68edc.py b/cao_blogr/alembic/versions/20221208_b6095fa68edc.py
deleted file mode 100644
index 0c33480..0000000
--- a/cao_blogr/alembic/versions/20221208_b6095fa68edc.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""init
-
-Revision ID: b6095fa68edc
-Revises: 86d2844ace15
-Create Date: 2022-12-08 16:22:49.206993
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'b6095fa68edc'
-down_revision = '86d2844ace15'
-branch_labels = None
-depends_on = None
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
diff --git a/cao_blogr/alembic/versions/20181223_5899f27f265f.py b/cao_blogr/alembic/versions/20230121_d335bb2cb9da.py
similarity index 65%
rename from cao_blogr/alembic/versions/20181223_5899f27f265f.py
rename to cao_blogr/alembic/versions/20230121_d335bb2cb9da.py
index 0b31f9a..c01a3df 100644
--- a/cao_blogr/alembic/versions/20181223_5899f27f265f.py
+++ b/cao_blogr/alembic/versions/20230121_d335bb2cb9da.py
@@ -1,8 +1,8 @@
 """init
 
-Revision ID: 5899f27f265f
+Revision ID: d335bb2cb9da
 Revises: 
-Create Date: 2018-12-23 16:39:13.677058
+Create Date: 2023-01-21 08:05:36.719719
 
 """
 from alembic import op
@@ -10,21 +10,18 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '5899f27f265f'
+revision = 'd335bb2cb9da'
 down_revision = None
 branch_labels = None
 depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('entries',
+    op.create_table('tags',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('title', sa.Unicode(length=255), nullable=False),
-    sa.Column('body', sa.UnicodeText(), nullable=True),
-    sa.Column('created', sa.DateTime(), nullable=True),
-    sa.Column('edited', sa.DateTime(), nullable=True),
-    sa.PrimaryKeyConstraint('id', name=op.f('pk_entries')),
-    sa.UniqueConstraint('title', name=op.f('uq_entries_title'))
+    sa.Column('tag', sa.Unicode(length=25), nullable=True),
+    sa.Column('tag_name', sa.Unicode(length=25), nullable=False),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_tags'))
     )
     op.create_table('users',
     sa.Column('id', sa.Integer(), nullable=False),
@@ -34,10 +31,25 @@ def upgrade():
     sa.PrimaryKeyConstraint('id', name=op.f('pk_users')),
     sa.UniqueConstraint('name', name=op.f('uq_users_name'))
     )
+    op.create_table('entries',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.Unicode(length=255), nullable=False),
+    sa.Column('body', sa.UnicodeText(), nullable=True),
+    sa.Column('created', sa.DateTime(), nullable=True),
+    sa.Column('creator', sa.Unicode(length=50), nullable=True),
+    sa.Column('edited', sa.DateTime(), nullable=True),
+    sa.Column('editor', sa.Unicode(length=50), nullable=True),
+    sa.Column('tag', sa.Unicode(length=25), nullable=True),
+    sa.Column('author', sa.Unicode(length=50), nullable=True),
+    sa.Column('status', sa.Unicode(length=50), nullable=True),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_entries')),
+    sa.UniqueConstraint('title', name=op.f('uq_entries_title'))
+    )
     # ### end Alembic commands ###
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('users')
     op.drop_table('entries')
+    op.drop_table('users')
+    op.drop_table('tags')
     # ### end Alembic commands ###
diff --git a/cao_blogr/models/blog_record.py b/cao_blogr/models/blog_record.py
index 978306e..a889358 100644
--- a/cao_blogr/models/blog_record.py
+++ b/cao_blogr/models/blog_record.py
@@ -15,12 +15,14 @@ class BlogRecord(Base):
     __tablename__ = 'entries'
     id = Column(Integer, primary_key=True)
     title = Column(Unicode(255), unique=True, nullable=False)
-    body = Column(UnicodeText, default=u'')
-    body_html = Column(UnicodeText, default=u'')
-    tag = Column(Unicode, default='pyramid')
-    topic = Column(Unicode, default='blog')
-    created = Column(DateTime, default=datetime.datetime.utcnow)
-    edited = Column(DateTime, default=datetime.datetime.utcnow)
+    body = Column(UnicodeText, default='')
+    created = Column(DateTime, default=datetime.datetime.now)
+    creator = Column(Unicode(50), default='')
+    edited = Column(DateTime, default=datetime.datetime.now)
+    editor = Column(Unicode(50), default='')
+    tag = Column(Unicode(25))
+    author = Column(Unicode(50), default='')
+    status = Column(Unicode(50), default='brouillon')
 
     @property
     def slug(self):
@@ -31,3 +33,8 @@ class BlogRecord(Base):
         return distance_of_time_in_words(self.created,
                                          datetime.datetime.utcnow())
 
+
+class Tags(Base):
+    __tablename__ = 'tags'
+    id = Column(Integer, primary_key=True)
+    tag = Column(Unicode(25))
diff --git a/cao_blogr/services/blog_record.py b/cao_blogr/services/blog_record.py
index 2f4cd4b..a3fe4b0 100644
--- a/cao_blogr/services/blog_record.py
+++ b/cao_blogr/services/blog_record.py
@@ -3,7 +3,7 @@ import datetime #<- will be used to set default dates on models
 
 from sqlalchemy import or_
 from ..models.blog_record import BlogRecord
-from markdown2 import Markdown
+
 
 
 class BlogRecordService(object):
@@ -32,26 +32,3 @@ class BlogRecordService(object):
         query = query.order_by(sa.desc(BlogRecord.created)).limit(10).all()
         return query
 
-
-    @classmethod
-    def proc_after_create(cls, request, _id):
-        entry = request.dbsession.query(BlogRecord).get(_id)
-        # set default values
-        if entry.tag == '':
-            entry.tag = 'pyramid'
-        if entry.topic == '':
-            entry.topic = 'blog'
-        # convertir mardown en HTML
-        markdowner = Markdown()
-        entry.body_html = markdowner.convert(entry.body)
-        return 
-
-    @classmethod
-    def proc_after_update(cls, request, _id):
-        entry = request.dbsession.query(BlogRecord).get(_id)
-        entry.edited = datetime.datetime.now()
-        # convertir mardown en HTML
-        markdowner = Markdown()
-        entry.body_html = markdowner.convert(entry.body)
-        return 
-
diff --git a/cao_blogr/templates/blog.jinja2 b/cao_blogr/templates/blog.jinja2
index cc3ca06..ceb8a8d 100644
--- a/cao_blogr/templates/blog.jinja2
+++ b/cao_blogr/templates/blog.jinja2
@@ -10,7 +10,7 @@
     {% endif %}
 
     <hr/>
-    <p>{{ entry.body_html | safe }}</p>
+    <p>{{ body_html | safe }}</p>
     <hr/>
     {% if request.authenticated_userid %}
         <p>
diff --git a/cao_blogr/templates/home.jinja2 b/cao_blogr/templates/home.jinja2
index 7e8789b..88ca4a4 100644
--- a/cao_blogr/templates/home.jinja2
+++ b/cao_blogr/templates/home.jinja2
@@ -19,6 +19,8 @@
 		  <td>{{ entry.tag }}</td>
 		  </td>
 		</tr>
+		{% else %}
+		<p class="text-danger">Aucun post trouvé</p>
 	  {% endfor %}
 	</table>
     
diff --git a/cao_blogr/views/blog.py b/cao_blogr/views/blog.py
index 0e89e72..25041f0 100644
--- a/cao_blogr/views/blog.py
+++ b/cao_blogr/views/blog.py
@@ -3,7 +3,8 @@ from pyramid.httpexceptions import HTTPNotFound, HTTPFound
 from ..models.blog_record import BlogRecord
 from ..services.blog_record import BlogRecordService
 from ..forms import BlogCreateForm, BlogUpdateForm, BlogSearchForm
-
+import markdown
+import datetime #<- will be used to set default dates on models
 
 @view_config(route_name='blog',
              renderer='cao_blogr:templates/blog.jinja2')
@@ -12,22 +13,23 @@ def blog(request):
     blog_id = request.matchdict['id']
     entry = BlogRecordService.by_id(request, blog_id)
 
-    # just created ? convert body to html
-    if entry.body_html == '':
-        BlogRecordService.proc_after_create(request, blog_id)
-
     if not entry:
             request.session.flash(u"Page non trouvée : %s" % blog_id, 'warning')
             return HTTPFound(location=request.route_url('home'))
+
+    # insèrer le path de static/img
+    body = entry.body.replace('static/', "%s/static/" % request.application_url)
+    # convertir de markdown en HTML
+    body_html = markdown.markdown(body, extensions=['footnotes'])
+   
     return {
         'page_title': entry.title,
-        'entry': entry
+        'entry': entry,
+        'body_html': body_html,
         }
 
 
-@view_config(route_name='blog_edit', 
-             renderer='cao_blogr:templates/blog_edit.jinja2',
-             permission='view')
+@view_config(route_name='blog_edit', renderer='cao_blogr:templates/blog_edit.jinja2', permission='view')
 def blog_edit(request):
     # get post id from request
     blog_id = request.matchdict['id']
@@ -51,15 +53,14 @@ def blog_edit(request):
     if 'form.submitted' in request.params and form.validate():
         if blog_id == '0':
             form.populate_obj(entry)
+            import pdb;pdb.set_trace()
             request.dbsession.add(entry)
             
             return HTTPFound(location=request.route_url('home'))
         else:
             del form.id  # SECURITY: prevent overwriting of primary key
             form.populate_obj(entry)
-
-            # after update procedure
-            BlogRecordService.proc_after_update(request, blog_id)
+            entry.edited = datetime.datetime.now()
 
             return HTTPFound(location=request.route_url('blog', id=entry.id, slug=entry.slug))
 
diff --git a/setup.py b/setup.py
index 7a5861c..8320403 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ requires = [
     'wtforms',  # form library 2.2.1
     'webhelpers2',  # various web building related helpers 2.0
     'passlib',
-    'markdown2',
+    'markdown',
 ]
 
 tests_require = [