Add comments recursion, add mail notification for user who is a parent of comment

Author: goors

CommentModel.py

@@ -9,17 +9,30 @@ def __init__(self):
 
     def comments(self, post):
 
-        comments = self.Comment.query.filter_by(Post=post.Id).all()
+        comments = self.Comment.query.filter_by(Post=post.Id,Parent=None).all()
 
         if comments:
             return comments
         return False
 
-    def addcomment(self, comment, email, nick, post):
+    def addcomment(self, comment, email, nick, post, cid=None):
 
         from models import db
-        new_comment = self.Comment(nick, email, comment, post)
+        if cid:
+            new_comment = self.Comment(nick, email, comment, post, cid)
+
+
+        else:
+            new_comment = self.Comment(nick, email, comment, post)
         db.session.add(new_comment)
         db.session.commit()
 
         return new_comment.Id
+
+
+    def getCommentEmail(self, id):
+        comments = self.Comment.query.filter_by(Id=id).first()
+
+        if comments:
+            return comments
+        return []

appconfig.py

@@ -5,6 +5,7 @@
 CRYPT_KEY = 'p@s$VV0Rd'
 
 URL = "https://pregmatch.org/admin"
+URL_FE = "https://pregmatch.org/"
 
 # administrator list
 ADMINS = ['[email protected]']

controllers/fe.py

@@ -4,6 +4,8 @@
 from UserModel import *
 from CommentModel import *
 from htmlmin.minify import html_minify
+from appconfig import *
+
 fe = Blueprint('fe', __name__)
 
 
@@ -42,10 +44,21 @@ def read(slug=None):
 
     if request.method == "POST":
 
-        if 'comment' in request.form:
+        if 'comment' in request.form and 'cid' not in request.form:
 
             comment.addcomment(request.form['comment'], request.form['email'], request.form['nick'], id.Id)
 
+        if 'comment' in request.form and 'cid' in request.form:
+
+            comment.addcomment(request.form['comment'], request.form['email'], request.form['nick'], id.Id, request.form['cid'])
+
+            ##send reply to if any email address defined
+            c = comment.getCommentEmail(request.form['cid'])
+            if c.Email:
+                from UserModel import UserModel
+                u = UserModel()
+                u.send_email(request.form['nick'] + " just commented on post "+id.Title, c.Email, request.form['comment']+ "<p>"+URL_FE+"read/"+id.Slug+"</p>", c.Nick)
+
         if 'password' in request.form:
 
             from werkzeug import check_password_hash
@@ -95,4 +108,12 @@ def utility_processor():
     def getimages(id):
         p = PostModel()
         return p.getPostImages(id)
-    return dict(getimages=getimages)
+    return dict(getimages=getimages)
+
+
+@fe.context_processor
+def utility_processor():
+    def getChildren(id):
+        p = CommentModel()
+        return p.getChildren(id)
+    return dict(getChildren=getChildren)

db.sql

@@ -219,4 +219,8 @@ CREATE TABLE IF NOT EXISTS `pregmatch`.`PostImage` (
     REFERENCES `pregmatch`.`Post` (`Id`)
     ON DELETE NO ACTION
     ON UPDATE NO ACTION)
-ENGINE = InnoDB
+ENGINE = InnoDB
+
+ALTER table Comment add `Parent` int(11) DEFAULT NULL;
+ALTER TABLE `Comment` ADD KEY `Parent` (`Parent`);
+ALTER TABLE `Comment` ADD CONSTRAINT `comment_ibfk_1` FOREIGN KEY (`Parent`) REFERENCES `Comment` (`Id`);

eer/db.mwb

@@ -2,22 +2,27 @@
 from models.Post import Post
 import time
 
+
 class Comment(db.Model):
+    __tablename__ = 'Comment'
+
+    Id = db.Column(db.Integer, primary_key=True)
+    Post = db.Column(db.Integer, db.ForeignKey(Post.Id))
+    Comment = db.Column(db.Text)
+    Email = db.Column(db.String(45), unique=True)
+    Nick = db.Column(db.String(6))
+    DateCreated = db.Column(db.DateTime)
+    Parent =  db.Column(db.Integer, db.ForeignKey("Comment.Id"))
+    children = db.relationship("Comment")
+
+    def __init__(self, nick, email, comment, post, cid=None):
+        self.Post = post
+        self.Comment = comment
+        self.Email = email
+        self.Nick = nick
+        self.Parent = cid
+        self.DateCreated = time.strftime('%Y-%m-%d %H:%M:%S')
 
-  __tablename__ = 'Comment'
 
-  Id = db.Column(db.Integer, primary_key = True)
-  Post = db.Column(db.Integer, db.ForeignKey(Post.Id))
-  Comment = db.Column(db.Text)
-  Email = db.Column(db.String(45), unique=True)
-  Nick = db.Column(db.String(6))
-  DateCreated = db.Column(db.DateTime)
-   
-  def __init__(self, nick, email, comment, post):
 
 
-    self.Post = post
-    self.Comment = comment
-    self.Email = email
-    self.Nick = nick
-    self.DateCreated = time.strftime('%Y-%m-%d %H:%M:%S')

eer/db.mwb.bak

@@ -43,7 +43,7 @@ <h3>{{ post.Title }}</h3>
 
         </div>
         <div class="col-xs-12">
-            <form method="post" action="/read/{{post.Slug}}">
+            <form method="post" action="/read/{{post.Slug}}" id="c_{{post.Slug}}">
                 <br />
                 <div class="form-group">
                     <input type="text" class="form-control" name="nick" placeholder="Nick (optional)" />
@@ -54,16 +54,25 @@ <h3>{{ post.Title }}</h3>
                 <textarea name="comment" class="form-control" rows="10" placeholder="Comment (mandatory)"></textarea>
                 <span style="font-size: 11px; float: left">You can use any html tag (p, pre ...)</span><br />
                 <input type="submit" value="Add comment" class="btn btn-primary" style="float: right" />
+                <input type="hidden" class="cid" name="cid" />
             </form>
             <div class="col-lg-12" style="text-align: left">
                 {% if comments %}
                 <hr />
-                {% for comment in comments%}
-                <span>Comment by: {{ comment.Nick }} - <span style="font-size: 11px;">created at {{ comment.DateCreated }}</span></span><br />
-                <div class="col-lg-12" style="text-align: left; margin-top: 10px">
-                    {{comment.Comment | safe}}
-                </div>
+                <ul style="list-style: none; panel panel-info">
+                {% for comment in comments recursive%}
+                    <li class="">
+                        <span style="font-size: 11px">{{ comment.Nick }} - <span style="font-size: 11px;">created at {{ comment.DateCreated }}</span> </span> |
+                        <a href="javascript: void(0)" onclick="javascript: reply($(this), '{{post.Slug}}', {{comment.Id}})">Reply</a> <br />
+                        <div class="col-lg-12" style="text-align: left; margin-top: 10px">
+                            {{comment.Comment | safe}}
+                        </div>
+                    {% if comment.children %}
+                        <ul style="list-style: none" >{{ loop(comment.children) }}</ul>
+                    {% endif %}
+                    </li>
                 {% endfor %}
+                </ul>
                 {% endif %}
             </div>
         </div>
@@ -82,4 +91,22 @@ <h3>{{ post.Title }}</h3>
 
     }
 </style>
+<script>
+
+    function reply(el, slug, id){
+
+
+        if(document.getElementsByClassName("d_"+slug).length){
+            $(".d_"+slug).remove();
+            el.text("Reply");
+        }
+        else {
+            $("#c_"+slug).clone().insertAfter(el.next().next()).attr("class","d_"+slug).find($(".cid").val(id));
+
+            el.text("Remove");
+
+        }
+    }
+
+</script>
 {% endblock %}