[ML4SE-267] research Unique Id.

ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/config/content/PluginInfoConfig.kt

@@ -6,7 +6,7 @@ import org.jetbrains.research.tasktracker.config.YamlConfigLoadStrategy
 import java.io.File
 
 @Serializable
-class PluginInfoConfig(val pluginName: String, val pluginDescription: String) : BaseConfig {
+class PluginInfoConfig(val pluginName: String, val pluginDescription: String, val researchId: String) : BaseConfig {
     override val configName: String
         get() = CONFIG_FILE_PREFIX
 

ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/IdRequests.kt

@@ -41,12 +41,16 @@ object IdRequests {
                 ?: error("MainPageConfig must not be null")
             try {
                 requireNotNull(GlobalPluginStorage.userId) { "User id is not defined" }
+                val researchId = TaskTrackerPlugin.mainConfig.pluginInfoConfig?.let {
+                    it.researchId
+                } ?: error("Plugin info config is uninitialized")
                 return@runBlocking client.submitForm(
                     url = url,
                     formParameters = mapOf(
                         "name" to pluginInfoConfig.pluginName,
                         "description" to pluginInfoConfig.pluginDescription,
-                        "user_id" to GlobalPluginStorage.userId.toString()
+                        "user_id" to GlobalPluginStorage.userId.toString(),
+                        "research_unique_id" to researchId
                     ).buildParameters()
                 ).body<Int>()
             } catch (e: IllegalArgumentException) {

ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/panelStates/DefaultStates.kt

@@ -30,6 +30,15 @@ fun Panel.agreementAcceptance() {
     setNextAction {
         checkAgreementInputs().runOnSuccess {
             if (!it) {
+                GlobalPluginStorage.agreementChecker?.let { agreement ->
+                    GlobalPluginStorage.userId = IdRequests.getUserId(agreement.name, agreement.email).alsoIfNull {
+                        notifyError(
+                            project,
+                            "Connection problems with the server, check tour connection or try later"
+                        )
+                    }
+                }
+                GlobalPluginStorage.currentResearchId = IdRequests.getResearchId()
                 welcomePage()
             } else {
                 notifyError(project, UIBundle.message("ui.please.fill"))
@@ -44,16 +53,6 @@ fun Panel.agreementAcceptance() {
 fun Panel.welcomePage() {
     loadBasePage(MainPageTemplate.loadCurrentTemplate(), "ui.button.next", false)
     setNextAction {
-        GlobalPluginStorage.agreementChecker?.let {
-            GlobalPluginStorage.userId = IdRequests.getUserId(it.name, it.email).alsoIfNull {
-                notifyError(
-                    project,
-                    "Connection problems with the server, either you entered an incorrect email or name."
-                )
-                return@setNextAction
-            }
-        }
-        GlobalPluginStorage.currentResearchId = IdRequests.getResearchId()
         TaskTrackerPlugin.initializationHandler.setupEnvironment(project)
         startTracking()
         processScenario()

ij-plugin/src/main/resources/org/jetbrains/research/tasktracker/config/info_default.yaml

@@ -1,2 +1,3 @@
 pluginName: Refactoring course
-pluginDescription: "We want to track your progress through the code refactoring course in order to collect data on file changes during the course completion. Please, when you are ready, press the next button."
+pluginDescription: "We want to track your progress through the code refactoring course in order to collect data on file changes during the course completion. Please, when you are ready, press the next button."
+researchId: "RefactoringCourse"

ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/database/models/Research.kt

@@ -11,6 +11,7 @@ class Research(id: EntityID<Int>) : Entity<Int>(id) {
     var name by Researches.name
     var description by Researches.description
     var user by User referencedOn Researches.user
+    var researchUniqueId by Researches.researchUniqueId
 }
 
 /**
@@ -31,4 +32,9 @@ object Researches : IntIdTable() {
      * User who took part in the research.
      */
     val user = reference("user", Users)
+
+    /**
+     * Unique id for research
+     */
+    val researchUniqueId = text("research_unique_id")
 }

ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/ResearchRequests.kt

@@ -20,6 +20,7 @@ fun Routing.createResearch() {
                     name = formParameters.getOrFail("name")
                     description = formParameters["description"]
                     user = User[formParameters.getOrFail<Int>("user_id")]
+                    researchUniqueId = formParameters.getOrFail("research_unique_id")
                 }.id.value
             }
             call.respondText(