From 0f4fedb82ebb66217996b3a9ff50a4e52ec1484e Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 28 2016 14:46:45 +0000
Subject: [PATCH 1/5] Add closed_at column to issues table


---

diff --git a/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py b/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py
new file mode 100644
index 0000000..28eafdb
--- /dev/null
+++ b/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py
@@ -0,0 +1,26 @@
+"""add_closed_at_in_issues
+
+Revision ID: ee8d5b76e817
+Revises: 317a285e04a8
+Create Date: 2016-06-28 18:04:05.539319
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'ee8d5b76e817'
+down_revision = '317a285e04a8'
+
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade():
+    ''' Add closed_at column in issues table '''
+    op.add_column(
+            'issues',
+            sa.Column('closed_at', sa.DateTime, nullable=True)
+    )
+
+
+def downgrade():
+    ''' Remove the closed_at column in issues table '''
+    op.drop_column('issues', 'closed_at')
diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index a87f035..93f9379 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -565,6 +565,8 @@ class Issue(BASE):
     date_created = sa.Column(sa.DateTime, nullable=False,
                              default=datetime.datetime.utcnow)
 
+    closed_at = sa.Column(sa.DateTime, nullable=True)
+
     project = relation(
         'Project', foreign_keys=[project_id], remote_side=[Project.id],
         backref=backref(
@@ -632,6 +634,8 @@ class Issue(BASE):
             'content': self.content,
             'status': self.status,
             'date_created': self.date_created.strftime('%s'),
+            'closed_at': self.closed_at.strftime(
+                '%s') if self.closed_at else None,
             'user': self.user.to_json(public=public),
             'private': self.private,
             'tags': self.tags_text,

From c25f97fc3b476244d237a481006fad44630f762c Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 28 2016 14:46:46 +0000
Subject: [PATCH 2/5] Show when the issue was closed, if not open


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 728e00a..08d9781 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1231,6 +1231,8 @@ def edit_issue(session, issue, ticketfolder, user,
         edit.append('content')
     if status and status != issue.status:
         issue.status = status
+        if status.lower() != 'open':
+            issue.closed_at = datetime.datetime.utcnow()
         edit.append('status')
     if priority:
         try:
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index b1c4330..c963f50 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -86,6 +86,9 @@
         <tr>
             <th id="issue-title">Issue</th>
             <th class="open_date">Opened</th>
+            {% if status and status|lower != 'open' %}
+            <th class="close_date">Closed</th>
+            {% endif %}
             <th class="priority" data-sort="int">
                 Priority&nbsp;(<a href="{{ url_for('view_issues', username=username,
                 repo=repo.name, tags=tags, author=author, assignee=assignee,
@@ -140,6 +143,14 @@
                 <span title="{{issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
                         issue.date_created | humanize}}</span>
             </td>
+            {% if status|lower != 'open' %}
+            <td class="nowrap">
+                {% if issue.closed_at != None %}
+                <span title="{{issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                        issue.closed_at | humanize}}</span>
+                {% endif %}
+            </td>
+            {% endif %}
             <td class="td-priority nowrap" data-sort-value="{{
               issue.priority
               if issue.priority

From 1c6b975e0760b283a30509784e10665da02ad3d1 Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 28 2016 17:45:39 +0000
Subject: [PATCH 3/5] modify alembic script since the notification in issues


---

diff --git a/alembic/versions/43df5e588a87_add_closed_at_attribute_in_issues.py b/alembic/versions/43df5e588a87_add_closed_at_attribute_in_issues.py
new file mode 100644
index 0000000..5ceb1da
--- /dev/null
+++ b/alembic/versions/43df5e588a87_add_closed_at_attribute_in_issues.py
@@ -0,0 +1,27 @@
+"""add_closed_at_attribute_in_issues
+
+Revision ID: 43df5e588a87
+Revises: 22db0a833d35
+Create Date: 2016-06-28 22:59:36.653905
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '43df5e588a87'
+down_revision = '22db0a833d35'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ''' Add closed_at column in issues table '''
+    op.add_column(
+            'issues',
+            sa.Column('closed_at', sa.DateTime, nullable=True)
+    )
+
+
+def downgrade():
+    ''' Remove the closed_at column in issues table '''
+    op.drop_column('issues', 'closed_at')
diff --git a/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py b/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py
deleted file mode 100644
index 28eafdb..0000000
--- a/alembic/versions/ee8d5b76e817_add_closed_at_in_issues.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""add_closed_at_in_issues
-
-Revision ID: ee8d5b76e817
-Revises: 317a285e04a8
-Create Date: 2016-06-28 18:04:05.539319
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = 'ee8d5b76e817'
-down_revision = '317a285e04a8'
-
-from alembic import op
-import sqlalchemy as sa
-
-def upgrade():
-    ''' Add closed_at column in issues table '''
-    op.add_column(
-            'issues',
-            sa.Column('closed_at', sa.DateTime, nullable=True)
-    )
-
-
-def downgrade():
-    ''' Remove the closed_at column in issues table '''
-    op.drop_column('issues', 'closed_at')

From 9c6417594621e8f51e2e4b315fbd8ac27516c073 Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 28 2016 17:46:19 +0000
Subject: [PATCH 4/5] remove assignee when showing the issues closed


---

diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index c963f50..77095e9 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -99,11 +99,13 @@
                 repo=repo.name, tags=tags, assignee=assignee, priority=priority,
                 status=status) }}">reset</a>)
             </th>
+            {% if not status or status|lower == 'open' %}
             <th class="assigned">
               Assignee&nbsp;(<a href="{{ url_for('view_issues', username=username,
                 repo=repo.name, tags=tags, author=author, priority=priority,
                 status=status) }}">reset</a>)
             </th>
+            {% endif %}
         </tr>
     </thead>
     <tfoot>
@@ -143,7 +145,7 @@
                 <span title="{{issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
                         issue.date_created | humanize}}</span>
             </td>
-            {% if status|lower != 'open' %}
+            {% if status and status|lower != 'open' %}
             <td class="nowrap">
                 {% if issue.closed_at != None %}
                 <span title="{{issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
@@ -166,6 +168,7 @@
                 </a>
               {% endif %}
             </td>
+            {% if not status or status|lower == 'open' %}
             <td class="nowrap">
                 <a href="{{ url_for('view_issues', username=username,
                     repo=repo.name, author=issue.user.user,
@@ -175,6 +178,7 @@
                     {{ issue.user.user }}
                 </a>
             </td>
+            {% endif %}
             <td class="nowrap">
               {% if issue.assignee %}
               <a href="{{ url_for('view_issues', username=username,

From d7285b8b1dc221d8e59190c728377736aa8a69f4 Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 28 2016 20:37:23 +0000
Subject: [PATCH 5/5] modify tests after adding closed_at column in issues


---

diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index ad2520c..2b6fb7a 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -160,6 +160,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "comments": [],
                   "content": "This issue needs attention",
                   "date_created": "1431414800",
+                  "closed_at": None,
                   "depends": [],
                   "id": 1,
                   "priority": None,
@@ -212,6 +213,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "comments": [],
                   "content": "This issue needs attention",
                   "date_created": "1431414800",
+                  "closed_at": None,
                   "depends": [],
                   "id": 1,
                   "priority": None,
@@ -267,6 +269,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "comments": [],
                   "content": "This issue needs attention",
                   "date_created": "1431414800",
+                  "closed_at": None,
                   "depends": [],
                   "id": 1,
                   "priority": None,
@@ -308,6 +311,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "comments": [],
                   "content": "This issue needs attention",
                   "date_created": "1431414800",
+                  "closed_at": None,
                   "depends": [],
                   "id": 1,
                   "priority": None,
@@ -326,6 +330,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "comments": [],
                   "content": "We should work on this",
                   "date_created": "1431414800",
+                  "closed_at": None,
                   "depends": [],
                   "id": 2,
                   "priority": None,
@@ -401,6 +406,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                         "comments": [],
                         "content": "This issue needs attention",
                         "date_created": "1431414800",
+                        "closed_at": None,
                         "depends": [],
                         "id": 1,
                         "priority": None,
@@ -419,6 +425,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                         "comments": [],
                         "content": "We should work on this",
                         "date_created": "1431414800",
+                        "closed_at": None,
                         "depends": [],
                         "id": 2,
                         "priority": None,
@@ -476,6 +483,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
               "comments": [],
               "content": "This issue needs attention",
               "date_created": "1431414800",
+              "closed_at": None,
               "depends": [],
               "id": 1,
               "priority": None,
@@ -570,6 +578,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
               "comments": [],
               "content": "We should work on this",
               "date_created": "1431414800",
+              "closed_at": None,
               "depends": [],
               "id": 2,
               "priority": None,
@@ -597,6 +606,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
               "comments": [],
               "content": "We should work on this",
               "date_created": "1431414800",
+              "closed_at": None,
               "depends": [],
               "id": 2,
               "priority": None,
diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index f490f99..fff7ac4 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -470,10 +470,11 @@ new file mode 100644
 index 0000000..60f7480
 --- /dev/null
 +++ b/456
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,24 @@
 +{
 +    "assignee": null,
 +    "blocks": [],
++    "closed_at": null,
 +    "comments": [],
 +    "content": "We should work on this",
 +    "date_created": null,
@@ -515,6 +516,9 @@ index 0000000..60f7480
             elif 'date_created' in row:
                 t = row.split(': ')[0]
                 row = '%s: null,' % t
+            elif 'closed_at' in row:
+                t = row.split(': ')[0]
+                row = '%s: null,' % t
             elif row.startswith('index 00'):
                 row = 'index 0000000..60f7480'
             elif row.startswith('+++ b/'):
@@ -550,10 +554,10 @@ diff --git a/123 b/456
 index 458821a..77674a8
 --- a/123
 +++ b/456
-@@ -1,7 +1,25 @@
- {
+@@ -2,7 +2,25 @@
      "assignee": null,
      "blocks": [],
+     "closed_at": null,
 -    "comments": [],
 +    "comments": [
 +        {
@@ -597,6 +601,9 @@ index 458821a..77674a8
             elif 'date_created' in row:
                 t = row.split(': ')[0]
                 row = '%s: null,' % t
+            elif 'closed_at' in row:
+                t = row.split(': ')[0]
+                row = '%s: null,' % t
             elif row.startswith('index'):
                 row = 'index 458821a..77674a8'
             elif row.startswith('--- a/'):