From 4eeb79ab80fedec0b8d69dc901cb5d9cb326e312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 27 May 2019 09:19:52 +0300
Subject: [PATCH] #98 changelog edited

---
 .../java/ru/ulstu/deadline/model/Deadline.java     | 10 +++++-----
 .../db/changelog-20190517_000001-schema.xml        | 14 ++++++++++++++
 src/main/resources/db/changelog-master.xml         |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190517_000001-schema.xml

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 5ab9f47..4dfebef 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -20,7 +20,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    private String executor;
+    private Integer executor;
     private Boolean done;
 
     public Deadline() {
@@ -31,7 +31,7 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
+    public Deadline(Date deadlineDate, String description, Integer executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
         this.executor = executor;
@@ -42,7 +42,7 @@ public class Deadline extends BaseEntity {
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
                     @JsonProperty("date") Date date,
-                    @JsonProperty("executor") String executor,
+                    @JsonProperty("executor") Integer executor,
                     @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
@@ -67,11 +67,11 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public String getExecutor() {
+    public Integer getExecutor() {
         return executor;
     }
 
-    public void setExecutor(String executor) {
+    public void setExecutor(Integer executor) {
         this.executor = executor;
     }
 
diff --git a/src/main/resources/db/changelog-20190517_000001-schema.xml b/src/main/resources/db/changelog-20190517_000001-schema.xml
new file mode 100644
index 0000000..73c6435
--- /dev/null
+++ b/src/main/resources/db/changelog-20190517_000001-schema.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190517_000001-1">
+        <modifyDataType tableName="deadline"
+                        columnName="executor"
+                        newDataType="integer"
+                        schemaName="public"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="executor"
+                                 constraintName="fk_deadline_executor" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 1cab67b..d81f1cb 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -44,4 +44,5 @@
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190517_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file