From 7e2c490e4be6712e849a648e8792b6dd64d47c7b Mon Sep 17 00:00:00 2001
From: tdurieux <durieuxthomas@hotmail.com>
Date: Tue, 25 Apr 2023 23:40:12 +0200
Subject: [PATCH] feat(#200): save the commit date of the anonymized commit

---
 public/partials/explorer.htm                      |  7 ++++++-
 src/Repository.ts                                 | 14 +++++++++++++-
 .../anonymizedRepositories.schema.ts              |  1 +
 .../anonymizedRepositories.types.ts               |  1 +
 src/routes/repository-public.ts                   |  4 +++-
 src/source/GitHubRepository.ts                    | 15 +++++++++++++++
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/public/partials/explorer.htm b/public/partials/explorer.htm
index 133154f..5d95b6b 100644
--- a/public/partials/explorer.htm
+++ b/public/partials/explorer.htm
@@ -3,7 +3,12 @@
     <div class="leftCol shadow p-1 overflow-auto" ng-show="files">
       <tree class="files" file="files"></tree>
       <div class="bottom column">
-        <div class="last-update">
+        <div
+          class="last-update"
+          data-toggle="tooltip"
+          data-placement="top"
+          title="{{options.lastUpdateDate}}"
+        >
           Last Update: {{options.lastUpdateDate|date}}
         </div>
       </div>
diff --git a/src/Repository.ts b/src/Repository.ts
index 46c688c..979b396 100644
--- a/src/Repository.ts
+++ b/src/Repository.ts
@@ -191,9 +191,10 @@ export default class Repository {
     ) {
       // Only GitHubBase can be update for the moment
       if (this.source instanceof GitHubBase) {
+        const token = await this.source.getToken();
         const branches = await this.source.githubRepository.branches({
           force: true,
-          accessToken: await this.source.getToken(),
+          accessToken: token,
         });
         const branch = this.source.branch;
         const newCommit = branches.filter((f) => f.name == branch.name)[0]
@@ -203,6 +204,17 @@ export default class Repository {
           return;
         }
         this._model.source.commit = newCommit;
+        const commitInfo = await this.source.githubRepository.getCommitInfo(
+          newCommit,
+          {
+            accessToken: token,
+          }
+        );
+        if (commitInfo.commit.author?.date) {
+          this._model.source.commitDate = new Date(
+            commitInfo.commit.author?.date
+          );
+        }
         branch.commit = newCommit;
 
         if (!newCommit) {
diff --git a/src/database/anonymizedRepositories/anonymizedRepositories.schema.ts b/src/database/anonymizedRepositories/anonymizedRepositories.schema.ts
index 9756bfe..d77e922 100644
--- a/src/database/anonymizedRepositories/anonymizedRepositories.schema.ts
+++ b/src/database/anonymizedRepositories/anonymizedRepositories.schema.ts
@@ -25,6 +25,7 @@ const AnonymizedRepositorySchema = new Schema({
     type: { type: String },
     branch: String,
     commit: String,
+    commitDate: Date,
     repositoryId: String,
     repositoryName: String,
     accessToken: String,
diff --git a/src/database/anonymizedRepositories/anonymizedRepositories.types.ts b/src/database/anonymizedRepositories/anonymizedRepositories.types.ts
index b01600e..ba74778 100644
--- a/src/database/anonymizedRepositories/anonymizedRepositories.types.ts
+++ b/src/database/anonymizedRepositories/anonymizedRepositories.types.ts
@@ -11,6 +11,7 @@ export interface IAnonymizedRepository {
     type: "GitHubDownload" | "GitHubStream" | "Zip";
     branch?: string;
     commit?: string;
+    commitDate?: Date,
     repositoryId?: string;
     repositoryName?: string;
     accessToken?: string;
diff --git a/src/routes/repository-public.ts b/src/routes/repository-public.ts
index a266421..140190a 100644
--- a/src/routes/repository-public.ts
+++ b/src/routes/repository-public.ts
@@ -153,7 +153,9 @@ router.get(
       res.json({
         url: redirectURL,
         download,
-        lastUpdateDate: repo.model.statusDate,
+        lastUpdateDate: repo.model.source.commitDate
+          ? repo.model.source.commitDate
+          : repo.model.anonymizeDate,
       });
     } catch (error) {
       handleError(error, res, req);
diff --git a/src/source/GitHubRepository.ts b/src/source/GitHubRepository.ts
index 8047492..12c3e40 100644
--- a/src/source/GitHubRepository.ts
+++ b/src/source/GitHubRepository.ts
@@ -44,6 +44,21 @@ export class GitHubRepository {
     return this._data.size;
   }
 
+  async getCommitInfo(
+    sha: string,
+    opt: {
+      accessToken?: string;
+    }
+  ) {
+    const octokit = new Octokit({ auth: opt.accessToken });
+    const commit = await octokit.repos.getCommit({
+      owner: this.owner,
+      repo: this.repo,
+      ref: sha,
+    });
+    return commit.data;
+  }
+
   async branches(opt: {
     accessToken?: string;
     force?: boolean;