From 5c700b9a9062b9d85b9d57c46d7e64dec530809f Mon Sep 17 00:00:00 2001
From: upagge <upagge@icloud.com>
Date: Mon, 21 Sep 2020 08:06:28 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20teamcity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property}/CommentSchedulerProperty.java   |  4 +---
 .../app/service/CommentAndTaskParser.java     |  2 +-
 .../v.2.0.0/2020-09-06-cumulative.xml         |  1 +
 .../liquibase/v.2.0.0/2020-09-20-teamcity.xml | 20 +++++++++++++++++++
 bitbucket-app/src/main/resources/logback.xml  |  2 +-
 5 files changed, 24 insertions(+), 5 deletions(-)
 rename {bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties => bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/property}/CommentSchedulerProperty.java (84%)
 create mode 100644 bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-20-teamcity.xml

diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/CommentSchedulerProperty.java b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/property/CommentSchedulerProperty.java
similarity index 84%
rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/CommentSchedulerProperty.java
rename to bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/property/CommentSchedulerProperty.java
index 65eed4e..042e334 100644
--- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/CommentSchedulerProperty.java
+++ b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/property/CommentSchedulerProperty.java
@@ -1,4 +1,4 @@
-package org.sadtech.bot.vcs.core.config.properties;
+package org.sadtech.bot.vcs.bitbucket.app.config.property;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -6,8 +6,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 /**
- * Данные для конфигурации {@link SchedulerComments}
- *
  * @author upagge
  */
 @Getter
diff --git a/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java
index 911e2c7..090bd1b 100644
--- a/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java
+++ b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java
@@ -4,11 +4,11 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.sadtech.basic.context.page.Sheet;
 import org.sadtech.basic.core.page.PaginationImpl;
+import org.sadtech.bot.vcs.bitbucket.app.config.property.CommentSchedulerProperty;
 import org.sadtech.bot.vcs.bitbucket.app.service.executor.DataScan;
 import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
 import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
 import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
-import org.sadtech.bot.vcs.core.config.properties.CommentSchedulerProperty;
 import org.sadtech.bot.vcs.core.config.properties.InitProperty;
 import org.sadtech.bot.vcs.core.domain.entity.Comment;
 import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
diff --git a/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml b/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
index bf73835..5224d2e 100644
--- a/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
+++ b/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
@@ -6,5 +6,6 @@
     <include file="liquibase/v.2.0.0/2020-09-06-create-table.xml"/>
     <include file="liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml"/>
     <include file="liquibase/v.2.0.0/2020-09-20-setting-notify.xml"/>
+    <include file="liquibase/v.2.0.0/2020-09-20-teamcity.xml"/>
 
 </databaseChangeLog>
\ No newline at end of file
diff --git a/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-20-teamcity.xml b/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-20-teamcity.xml
new file mode 100644
index 0000000..cdbf5f0
--- /dev/null
+++ b/bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-20-teamcity.xml
@@ -0,0 +1,20 @@
+<databaseChangeLog
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet id="2020-09-20-create-table-teamcity_builds" author="upagge">
+        <createTable tableName="teamcity_builds">
+            <column name="id" type="int">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+    <changeSet id="2020-09-20-create-table-teamcity-setting" author="upagge">
+        <createTable tableName="teamcity_setting">
+            <column name=""></column>
+        </createTable>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/bitbucket-app/src/main/resources/logback.xml b/bitbucket-app/src/main/resources/logback.xml
index e106cf3..0335154 100644
--- a/bitbucket-app/src/main/resources/logback.xml
+++ b/bitbucket-app/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
     </appender>
 
     <root level="info">
-        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
     </root>
 
 </configuration>
\ No newline at end of file