feat: per repo combine (#232)

Author: anatolystansler

src/main/kotlin/app/hashers/RepoHasher.kt

@@ -40,7 +40,8 @@ class RepoHasher(private val api: Api,
             val (rehashes, authors, commitsCount) =
                 CommitCrawler.fetchRehashesAndAuthors(git)
             localRepo.parseGitConfig(git.repository.config)
-            val serverRepo = initServerRepo(localRepo, rehashes.last)
+            val serverRepo = initServerRepo(localRepo, rehashes.last,
+                processEntryId)
 
             // Get repo setup (commits, emails to hash) from server.
             postRepoFromServer(serverRepo)
@@ -148,11 +149,13 @@ class RepoHasher(private val api: Api,
     }
 
     private fun initServerRepo(localRepo: LocalRepo,
-                               initCommitRehash: String): Repo {
+                               initCommitRehash: String,
+                               processEntryId: Int?): Repo {
         val rehash = RepoHelper.calculateRepoRehash(initCommitRehash, localRepo)
         val repo = Repo(initialCommitRehash = initCommitRehash,
                         rehash = rehash,
-                        meta = localRepo.meta)
+                        meta = localRepo.meta,
+                        processEntryId = processEntryId ?: 0)
         Logger.debug { "Local repo path: ${localRepo.path}" }
         Logger.debug { "Repo remote: ${localRepo.remoteOrigin}" }
         Logger.debug { "Repo rehash: $rehash" }

src/main/kotlin/app/model/ProcessEntry.kt

@@ -26,10 +26,10 @@ data class ProcessEntry(
 
     fun getProto(): Protos.ProcessEntry {
         return Protos.ProcessEntry.newBuilder()
-                     .setId(id)
-                     .setStatus(status)
-                     .setErrorCode(errorCode)
-                     .build()
+            .setId(id)
+            .setStatus(status)
+            .setErrorCode(errorCode)
+            .build()
     }
 
     fun serialize(): ByteArray {

src/main/kotlin/app/model/Repo.kt

@@ -23,14 +23,18 @@ data class Repo(
     var commits: List<Commit> = listOf(),
 
     // Meta info about repo. Is not used for a locally run app.
-    var meta: RepoMeta = RepoMeta()
+    var meta: RepoMeta = RepoMeta(),
+
+    // Processing session id, used to check the processing status.
+    var processEntryId: Int = 0
 ) {
     @Throws(InvalidParameterException::class)
     constructor(proto: Protos.Repo) : this() {
         rehash = proto.rehash
         initialCommitRehash = proto.initialCommitRehash
         emails = proto.emailsList
         commits = proto.commitsList.map { Commit(it) }
+        processEntryId = proto.processEntryId
     }
 
     @Throws(InvalidProtocolBufferException::class)
@@ -45,6 +49,7 @@ data class Repo(
             .addAllEmails(emails)
             .addAllCommits(commits.map { it.getProto() })
             .setMeta(meta.getProto())
+            .setProcessEntryId(processEntryId)
             .build()
     }
 

src/main/proto/sourcerer.proto

@@ -117,6 +117,9 @@ message Repo {
 
     // Meta info about repo. Is not used for a locally run app.
     RepoMeta meta = 6;
+
+    // Processing session id, used to check the processing status.
+    uint32 process_entry_id = 7;
 }
 
 // Meta info about repo. Is not used for a locally run app.