From 8e6c387063c2c5a26e62796dbb9546c2cfcd7e22 Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Tue, 16 Apr 2019 16:40:43 +0300 Subject: [PATCH 1/6] init commit --- .../bend/config/security/SecurityConfig.java | 1 + .../bend/controller/AppController.java | 2 +- .../bend/controller/FrontendController.java | 63 +++++++++++++++++++ .../io/khasang/bend/entity/HomePagesUrl.java | 29 +++++++++ .../java/io/khasang/bend/entity/School.java | 33 ++++++++++ .../java/io/khasang/bend/entity/User.java | 46 +++++++++++--- src/main/resources/hibernate.properties | 2 +- src/main/resources/util.properties | 4 +- .../SchoolControllerIntegrationTest.java | 10 +++ .../UserControllerIntegrationTest.java | 9 +++ 10 files changed, 185 insertions(+), 14 deletions(-) create mode 100644 src/main/java/io/khasang/bend/controller/FrontendController.java create mode 100644 src/main/java/io/khasang/bend/entity/HomePagesUrl.java diff --git a/src/main/java/io/khasang/bend/config/security/SecurityConfig.java b/src/main/java/io/khasang/bend/config/security/SecurityConfig.java index 2a49cdc..0ee1f14 100644 --- a/src/main/java/io/khasang/bend/config/security/SecurityConfig.java +++ b/src/main/java/io/khasang/bend/config/security/SecurityConfig.java @@ -27,6 +27,7 @@ public void configure(HttpSecurity http) throws Exception { .and().csrf().disable().cors().disable().formLogin().defaultSuccessUrl("/", false); } + // NON PRODUCTION!!! spring 3-4 // @Override // public void configure(AuthenticationManagerBuilder auth) throws Exception { diff --git a/src/main/java/io/khasang/bend/controller/AppController.java b/src/main/java/io/khasang/bend/controller/AppController.java index 1bcda38..e8d6277 100644 --- a/src/main/java/io/khasang/bend/controller/AppController.java +++ b/src/main/java/io/khasang/bend/controller/AppController.java @@ -41,7 +41,7 @@ public String getHelloPage(Model model) { return "hello"; } - @RequestMapping("/") + @RequestMapping("/menu") public String getBadgerPage() { return "menu"; } diff --git a/src/main/java/io/khasang/bend/controller/FrontendController.java b/src/main/java/io/khasang/bend/controller/FrontendController.java new file mode 100644 index 0000000..7cf0f03 --- /dev/null +++ b/src/main/java/io/khasang/bend/controller/FrontendController.java @@ -0,0 +1,63 @@ +package io.khasang.bend.controller; + +import io.khasang.bend.entity.HomePagesUrl; +import io.khasang.bend.entity.User; +import org.hibernate.Session; +import org.hibernate.SessionFactory; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import java.util.List; + +@Controller +@RequestMapping("/") +public class FrontendController { + + protected EntityManager entityManager; + + @RequestMapping(value = "{homepageadress}", method = RequestMethod.GET) + String getDynamicUriValueRegex(@PathVariable("homepageadress") String homepageadress){ + + Query q = entityManager.createQuery("FROM HomePagesUrl WHERE url = ?1"); + q.setParameter(1, homepageadress); + System.err.println("location query"+q.toString()); + List resultList = q.getResultList(); + if (!resultList.isEmpty()){ + System.out.println("location"+ homepageadress +"catched"); + } + return "student-template"; + } + + + //далее нужно проверить студент это или школа.. а лучше проверять это сразу в одном sql-запросе + +// @RequestMapping(value = "{name}", method = RequestMethod.GET) +// String getDynamicUriValueRegex(@PathVariable("name") String name){ +// System.out.println("Name is "+name); +// return "student-template"; +// } +// @RequestMapping(value = "{name}", method = RequestMethod.GET) +// String getDynamicUriValueRegex(@PathVariable("name") String name){ +// System.out.println("Name is "+name); +// return "student-template"; +// } + + @PersistenceContext + public void setEntityManager(EntityManager entityManager) { + this.entityManager = entityManager; + } + + public EntityManager getEntityManager() { + return entityManager; + } + + +} diff --git a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java new file mode 100644 index 0000000..438b66f --- /dev/null +++ b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java @@ -0,0 +1,29 @@ +package io.khasang.bend.entity; + +import javax.persistence.*; + +@Entity +@Table(name = "urls") +public class HomePagesUrl { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + Long id; + @Column(name = "location") + String location; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUrl() { + return location; + } + + public void setUrl(String url) { + this.location = location; + } +} \ No newline at end of file diff --git a/src/main/java/io/khasang/bend/entity/School.java b/src/main/java/io/khasang/bend/entity/School.java index abc866d..6a41a22 100644 --- a/src/main/java/io/khasang/bend/entity/School.java +++ b/src/main/java/io/khasang/bend/entity/School.java @@ -23,6 +23,9 @@ public class School { @Column(columnDefinition = "TEXT", name = "time_table") private String timeTable; + @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private HomePagesUrl url; + // MultipleBagFetchException: cannot simultaneously fetch multiple bags: невозможно получить несколько пакетов @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) private Set disciplinesSet = new HashSet<>(); @@ -109,4 +112,34 @@ public Set getPlacesSet() { public void setPlacesSet(Set placesSet) { this.placesSet = placesSet; } + + public HomePagesUrl getUrl() { + return url; + } + + public void setUrl(HomePagesUrl url) { + this.url = url; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + School school = (School) o; + + if (id != school.id) return false; + if (name != null ? !name.equals(school.name) : school.name != null) return false; + if (description != null ? !description.equals(school.description) : school.description != null) return false; + return logoSrc != null ? logoSrc.equals(school.logoSrc) : school.logoSrc == null; + } + + @Override + public int hashCode() { + int result = (int) (id ^ (id >>> 32)); + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (description != null ? description.hashCode() : 0); + result = 31 * result + (logoSrc != null ? logoSrc.hashCode() : 0); + return result; + } } \ No newline at end of file diff --git a/src/main/java/io/khasang/bend/entity/User.java b/src/main/java/io/khasang/bend/entity/User.java index 60d6e81..151e8cb 100644 --- a/src/main/java/io/khasang/bend/entity/User.java +++ b/src/main/java/io/khasang/bend/entity/User.java @@ -4,16 +4,7 @@ import io.khasang.bend.model.UserStatus; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.time.LocalDate; import java.util.ArrayList; import java.util.HashSet; @@ -49,6 +40,9 @@ public class User { private String interests; @Column(name = "role_id") private Integer role; + @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private HomePagesUrl url; + @ManyToMany(fetch = FetchType.EAGER,cascade = CascadeType.ALL) private Set disciplinesSet = new HashSet<>(); @@ -179,4 +173,36 @@ public String getInterests() { public void setInterests(String interests) { this.interests = interests; } + + public HomePagesUrl getUrl() { + return url; + } + + public void setUrl(HomePagesUrl url) { + this.url = url; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + User user = (User) o; + + if (id != null ? !id.equals(user.id) : user.id != null) return false; + if (!name.equals(user.name)) return false; + if (!lastName.equals(user.lastName)) return false; + if (!age.equals(user.age)) return false; + return gender == user.gender; + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + name.hashCode(); + result = 31 * result + lastName.hashCode(); + result = 31 * result + age.hashCode(); + result = 31 * result + (gender != null ? gender.hashCode() : 0); + return result; + } } diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties index 5e878f8..ba58962 100644 --- a/src/main/resources/hibernate.properties +++ b/src/main/resources/hibernate.properties @@ -1,4 +1,4 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.show_sql=true hibernate.format_sql=true -hibernate.hbm2ddl.auto=create \ No newline at end of file +hibernate.hbm2ddl.auto=update \ No newline at end of file diff --git a/src/main/resources/util.properties b/src/main/resources/util.properties index 76a23ba..61400b3 100644 --- a/src/main/resources/util.properties +++ b/src/main/resources/util.properties @@ -1,4 +1,4 @@ jdbc.postgresql.driver=org.postgresql.Driver jdbc.postgresql.url=jdbc:postgresql://localhost:5432/bend -jdbc.postgresql.username=root -jdbc.postgresql.password=root \ No newline at end of file +jdbc.postgresql.username=postgres +jdbc.postgresql.password=postgres \ No newline at end of file diff --git a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java index 6ef2942..a258f5a 100644 --- a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java @@ -4,6 +4,7 @@ import io.khasang.bend.entity.Place; import io.khasang.bend.entity.Point; import io.khasang.bend.entity.School; +import io.khasang.bend.entity.Url; import org.junit.Test; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.*; @@ -94,6 +95,12 @@ private School createSchool() { return createdSchool; } + private Url createUrl(){ + Url url = new Url(); + url.setUrl(String.valueOf(url.hashCode())); + return url; + } + private School prefillSchool() { School school = new School(); //school.setId(1); @@ -124,6 +131,9 @@ private School prefillSchool() { set.add(place2); school.setPlacesSet(set); + + school.setUrl(createUrl()); + return school; } } \ No newline at end of file diff --git a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java index ae08bed..1cd3bce 100644 --- a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.khasang.bend.controller; import io.khasang.bend.dto.UserDto; +import io.khasang.bend.entity.Url; import io.khasang.bend.entity.User; import io.khasang.bend.model.Gender; import io.khasang.bend.model.UserStatus; @@ -11,6 +12,7 @@ import java.time.LocalDate; import java.util.List; +import java.util.Random; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -95,6 +97,12 @@ private User createUser() { return createdUser; } + private Url createUrl(){ + Url url = new Url(); + url.setUrl(String.valueOf(url.hashCode())); + return url; + } + private User prefillUser() { User user = new User(); user.setName("Ivan"); @@ -110,6 +118,7 @@ private User prefillUser() { user.setHealthLimited(false); user.setUserDescription("NERD"); user.setInterests("Wakeboarding"); + user.setUrl(createUrl()); return user; } } From bf599a5d72d1f8a3b1d36644f688e305028d773d Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Tue, 16 Apr 2019 16:44:50 +0300 Subject: [PATCH 2/6] hotfixes --- src/main/java/io/khasang/bend/entity/School.java | 8 ++------ .../bend/controller/SchoolControllerIntegrationTest.java | 6 +++--- .../bend/controller/UserControllerIntegrationTest.java | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/khasang/bend/entity/School.java b/src/main/java/io/khasang/bend/entity/School.java index 6a41a22..92f90d3 100644 --- a/src/main/java/io/khasang/bend/entity/School.java +++ b/src/main/java/io/khasang/bend/entity/School.java @@ -129,17 +129,13 @@ public boolean equals(Object o) { School school = (School) o; if (id != school.id) return false; - if (name != null ? !name.equals(school.name) : school.name != null) return false; - if (description != null ? !description.equals(school.description) : school.description != null) return false; - return logoSrc != null ? logoSrc.equals(school.logoSrc) : school.logoSrc == null; + return name.equals(school.name); } @Override public int hashCode() { int result = (int) (id ^ (id >>> 32)); - result = 31 * result + (name != null ? name.hashCode() : 0); - result = 31 * result + (description != null ? description.hashCode() : 0); - result = 31 * result + (logoSrc != null ? logoSrc.hashCode() : 0); + result = 31 * result + name.hashCode(); return result; } } \ No newline at end of file diff --git a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java index a258f5a..82531bb 100644 --- a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java @@ -4,7 +4,7 @@ import io.khasang.bend.entity.Place; import io.khasang.bend.entity.Point; import io.khasang.bend.entity.School; -import io.khasang.bend.entity.Url; +import io.khasang.bend.entity.HomePagesUrl; import org.junit.Test; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.*; @@ -95,8 +95,8 @@ private School createSchool() { return createdSchool; } - private Url createUrl(){ - Url url = new Url(); + private HomePagesUrl createUrl(){ + HomePagesUrl url = new HomePagesUrl(); url.setUrl(String.valueOf(url.hashCode())); return url; } diff --git a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java index 1cd3bce..6e72490 100644 --- a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java @@ -1,7 +1,7 @@ package io.khasang.bend.controller; import io.khasang.bend.dto.UserDto; -import io.khasang.bend.entity.Url; +import io.khasang.bend.entity.HomePagesUrl; import io.khasang.bend.entity.User; import io.khasang.bend.model.Gender; import io.khasang.bend.model.UserStatus; @@ -97,8 +97,8 @@ private User createUser() { return createdUser; } - private Url createUrl(){ - Url url = new Url(); + private HomePagesUrl createUrl(){ + HomePagesUrl url = new HomePagesUrl(); url.setUrl(String.valueOf(url.hashCode())); return url; } From 717b03b7d6319db66f54ff9aafae244190e0813d Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Tue, 16 Apr 2019 17:00:17 +0300 Subject: [PATCH 3/6] hotfixes 2 --- src/main/java/io/khasang/bend/entity/HomePagesUrl.java | 8 ++++---- src/main/resources/hibernate.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java index 438b66f..ff232a8 100644 --- a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java +++ b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java @@ -8,8 +8,8 @@ public class HomePagesUrl { @Id @GeneratedValue(strategy = GenerationType.AUTO) Long id; - @Column(name = "location") - String location; + @Column(name = "url") + String url; public Long getId() { return id; @@ -20,10 +20,10 @@ public void setId(Long id) { } public String getUrl() { - return location; + return url; } public void setUrl(String url) { - this.location = location; + this.url = url; } } \ No newline at end of file diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties index ba58962..5e878f8 100644 --- a/src/main/resources/hibernate.properties +++ b/src/main/resources/hibernate.properties @@ -1,4 +1,4 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.show_sql=true hibernate.format_sql=true -hibernate.hbm2ddl.auto=update \ No newline at end of file +hibernate.hbm2ddl.auto=create \ No newline at end of file From e31b2ddcf0a2bfcf38c89b0daae8754d0c86fe5a Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Tue, 16 Apr 2019 18:04:53 +0300 Subject: [PATCH 4/6] hotfixes 3 --- .../java/io/khasang/bend/controller/FrontendController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/io/khasang/bend/controller/FrontendController.java b/src/main/java/io/khasang/bend/controller/FrontendController.java index 7cf0f03..2a70507 100644 --- a/src/main/java/io/khasang/bend/controller/FrontendController.java +++ b/src/main/java/io/khasang/bend/controller/FrontendController.java @@ -34,6 +34,9 @@ String getDynamicUriValueRegex(@PathVariable("homepageadress") String homepagead System.out.println("location"+ homepageadress +"catched"); } return "student-template"; + + + entityManager. } From b90b9ea1b7e07a6b0f7d7c0528150d6c6b8dbf3b Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Wed, 17 Apr 2019 18:08:34 +0300 Subject: [PATCH 5/6] entity_id solved the problem --- .../bend/controller/FrontendController.java | 42 +++++++------------ .../io/khasang/bend/entity/HomePagesUrl.java | 11 +++++ .../java/io/khasang/bend/entity/School.java | 1 + src/main/resources/hibernate.properties | 2 +- .../SchoolControllerIntegrationTest.java | 1 + .../UserControllerIntegrationTest.java | 1 + 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/khasang/bend/controller/FrontendController.java b/src/main/java/io/khasang/bend/controller/FrontendController.java index 2a70507..5d35fbf 100644 --- a/src/main/java/io/khasang/bend/controller/FrontendController.java +++ b/src/main/java/io/khasang/bend/controller/FrontendController.java @@ -1,13 +1,8 @@ package io.khasang.bend.controller; import io.khasang.bend.entity.HomePagesUrl; -import io.khasang.bend.entity.User; -import org.hibernate.Session; -import org.hibernate.SessionFactory; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -24,35 +19,30 @@ public class FrontendController { protected EntityManager entityManager; @RequestMapping(value = "{homepageadress}", method = RequestMethod.GET) - String getDynamicUriValueRegex(@PathVariable("homepageadress") String homepageadress){ + String getDynamicUriValueRegex(@PathVariable("homepageadress") String homepageadress, Model model){ Query q = entityManager.createQuery("FROM HomePagesUrl WHERE url = ?1"); + q.setParameter(1, homepageadress); System.err.println("location query"+q.toString()); List resultList = q.getResultList(); if (!resultList.isEmpty()){ + HomePagesUrl homePagesUrl = resultList.get(0); + int i = homePagesUrl.getEntityId(); + switch (i){ + case 0: + model.addAttribute("urlId", homePagesUrl.getId()); + return "student-template"; + case 1: + model.addAttribute("urlId", homePagesUrl.getId()); + return "manager-template"; + } + System.out.println("location"+ homepageadress +"catched"); } return "student-template"; - - - entityManager. } - - //далее нужно проверить студент это или школа.. а лучше проверять это сразу в одном sql-запросе - -// @RequestMapping(value = "{name}", method = RequestMethod.GET) -// String getDynamicUriValueRegex(@PathVariable("name") String name){ -// System.out.println("Name is "+name); -// return "student-template"; -// } -// @RequestMapping(value = "{name}", method = RequestMethod.GET) -// String getDynamicUriValueRegex(@PathVariable("name") String name){ -// System.out.println("Name is "+name); -// return "student-template"; -// } - @PersistenceContext public void setEntityManager(EntityManager entityManager) { this.entityManager = entityManager; @@ -61,6 +51,4 @@ public void setEntityManager(EntityManager entityManager) { public EntityManager getEntityManager() { return entityManager; } - - -} +} \ No newline at end of file diff --git a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java index ff232a8..16974b4 100644 --- a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java +++ b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java @@ -7,9 +7,12 @@ public class HomePagesUrl { @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "id") Long id; @Column(name = "url") String url; + @Column(name = "entity_id") + Integer entityId; public Long getId() { return id; @@ -26,4 +29,12 @@ public String getUrl() { public void setUrl(String url) { this.url = url; } + + public Integer getEntityId() { + return entityId; + } + + public void setEntityId(Integer entityId) { + this.entityId = entityId; + } } \ No newline at end of file diff --git a/src/main/java/io/khasang/bend/entity/School.java b/src/main/java/io/khasang/bend/entity/School.java index 92f90d3..475dede 100644 --- a/src/main/java/io/khasang/bend/entity/School.java +++ b/src/main/java/io/khasang/bend/entity/School.java @@ -24,6 +24,7 @@ public class School { private String timeTable; @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) + //@Column(name = "url_id") private HomePagesUrl url; // MultipleBagFetchException: cannot simultaneously fetch multiple bags: невозможно получить несколько пакетов diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties index 5e878f8..ba58962 100644 --- a/src/main/resources/hibernate.properties +++ b/src/main/resources/hibernate.properties @@ -1,4 +1,4 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.show_sql=true hibernate.format_sql=true -hibernate.hbm2ddl.auto=create \ No newline at end of file +hibernate.hbm2ddl.auto=update \ No newline at end of file diff --git a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java index 82531bb..323b93c 100644 --- a/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/SchoolControllerIntegrationTest.java @@ -97,6 +97,7 @@ private School createSchool() { private HomePagesUrl createUrl(){ HomePagesUrl url = new HomePagesUrl(); + url.setEntityId(1); url.setUrl(String.valueOf(url.hashCode())); return url; } diff --git a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java index 6e72490..64cc55c 100644 --- a/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java +++ b/src/test/java/io/khasang/bend/controller/UserControllerIntegrationTest.java @@ -99,6 +99,7 @@ private User createUser() { private HomePagesUrl createUrl(){ HomePagesUrl url = new HomePagesUrl(); + url.setEntityId(0); url.setUrl(String.valueOf(url.hashCode())); return url; } From d598fd1599ae592c0d6637469650fce2fd9611a9 Mon Sep 17 00:00:00 2001 From: Ostap Strashevskii Date: Wed, 17 Apr 2019 21:16:54 +0300 Subject: [PATCH 6/6] entity_it to entity_type --- src/main/java/io/khasang/bend/entity/HomePagesUrl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java index 16974b4..e14e272 100644 --- a/src/main/java/io/khasang/bend/entity/HomePagesUrl.java +++ b/src/main/java/io/khasang/bend/entity/HomePagesUrl.java @@ -11,7 +11,7 @@ public class HomePagesUrl { Long id; @Column(name = "url") String url; - @Column(name = "entity_id") + @Column(name = "entity_type") Integer entityId; public Long getId() {