From 8365741988bb6c771ff531256844047122299891 Mon Sep 17 00:00:00 2001 From: rit_croque Date: Fri, 2 Feb 2024 17:14:29 +0000 Subject: [PATCH 1/5] feat: configure the project to run on a Tomcat 7 server --- .classpath | 26 +++++++++---------- ...se.wst.validation.validationbuilder.launch | 7 +++++ .project | 7 ++++- ....eclipse.wst.common.project.facet.core.xml | 20 +++++++------- .settings/org.eclipse.wst.validation.prefs | 8 ++++++ 5 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 .externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch create mode 100644 .settings/org.eclipse.wst.validation.prefs diff --git a/.classpath b/.classpath index ddeaa5b..27469b6 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch new file mode 100644 index 0000000..390d506 --- /dev/null +++ b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.project b/.project index f106b83..e159237 100644 --- a/.project +++ b/.project @@ -16,8 +16,13 @@ - org.eclipse.wst.validation.validationbuilder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index cb10a17..eabe095 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..cc2d6d8 --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,8 @@ +DELEGATES_PREFERENCE=delegateValidatorList +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; +USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationtrueversion1.3.0.v202308161955 +eclipse.preferences.version=1 +override=true +suspend=true +vf.version=3 From d577d63b638717ba5d98c5208db08093571b2c14 Mon Sep 17 00:00:00 2001 From: rit_croque Date: Fri, 2 Feb 2024 17:14:49 +0000 Subject: [PATCH 2/5] feat: Add the logout functionality --- .../com/my_app/page/logout/LogoutAction.java | 30 +++++++++++++++++++ src/main/webapp/WEB-INF/struts-config.xml | 2 ++ src/main/webapp/incl/header.jsp | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/my_app/page/logout/LogoutAction.java diff --git a/src/main/java/com/my_app/page/logout/LogoutAction.java b/src/main/java/com/my_app/page/logout/LogoutAction.java new file mode 100644 index 0000000..a9fca36 --- /dev/null +++ b/src/main/java/com/my_app/page/logout/LogoutAction.java @@ -0,0 +1,30 @@ +package com.my_app.page.logout; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import com.my_app.AppConstants; +import com.my_app.utils.LoginUtils; + +public class LogoutAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest req, + HttpServletResponse resp) throws Exception { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + + req.getSession().setAttribute(AppConstants.SESSION_ATTR_KEY_IS_LOGGED_IN, false); + req.getSession().setAttribute("username", null); + + return mapping.findForward("actionLoginRedir"); + } + +} diff --git a/src/main/webapp/WEB-INF/struts-config.xml b/src/main/webapp/WEB-INF/struts-config.xml index 12cd624..8810f1e 100644 --- a/src/main/webapp/WEB-INF/struts-config.xml +++ b/src/main/webapp/WEB-INF/struts-config.xml @@ -23,6 +23,8 @@ + + diff --git a/src/main/webapp/incl/header.jsp b/src/main/webapp/incl/header.jsp index 92be318..09eb7cc 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -27,7 +27,7 @@ From 160fe30d177be85e3f143efbb6c795de666a7d72 Mon Sep 17 00:00:00 2001 From: rit_croque Date: Fri, 2 Feb 2024 17:51:53 +0000 Subject: [PATCH 3/5] feat: Added private and public static page. --- src/main/webapp/incl/header.jsp | 6 ++++ src/main/webapp/js/static.js | 21 +++++++++++++ src/main/webapp/page-layout/static.jsp | 41 ++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 src/main/webapp/js/static.js create mode 100644 src/main/webapp/page-layout/static.jsp diff --git a/src/main/webapp/incl/header.jsp b/src/main/webapp/incl/header.jsp index 09eb7cc..1d5f026 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -16,6 +16,12 @@
  • Default
  • With sidebar
  • Full-width fluid
    • + +
  • Static Logged in
    • +     + +
  • Static
    • +
  • diff --git a/src/main/webapp/js/static.js b/src/main/webapp/js/static.js new file mode 100644 index 0000000..deefc16 --- /dev/null +++ b/src/main/webapp/js/static.js @@ -0,0 +1,21 @@ +$( document ).ready(function() { + + $("#progress").data("progress", 0); + + $( "#click" ).on( "click", function() { + console.log("Button was clicked!"); + let progress = $("#progress").data("progress"); + if( progress < 100 && progress >= 0 ) { + progress += 10 + $("#progress").css("width", progress.toString() + "%"); + $("#progress .sr-only").text( progress.toString() + "% Complete" ); + $("#progress").data("progress", progress); + } else if ( progress === 100 ) { + progress = 0 + $("#progress").css("width", progress.toString() + "%"); + $("#progress .sr-only").text( progress.toString() + "% Complete" ); + $("#progress").data("progress", progress); + } + } ); + +}); \ No newline at end of file diff --git a/src/main/webapp/page-layout/static.jsp b/src/main/webapp/page-layout/static.jsp new file mode 100644 index 0000000..6e75431 --- /dev/null +++ b/src/main/webapp/page-layout/static.jsp @@ -0,0 +1,41 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> + + + + + + +Static <c:if test="${isLoggedIn eq true}">Logged in</c:if> + + + + + + +
    +
      +
    1. My App
      2. +
    2. Static Logged in
      3. +
    +

    Static Logged In

    +

    Nam tincidunt placerat tortor. Praesent vehicula tempus nisl quis rhoncus. Etiam a gravida ipsum, ac venenatis metus. Nulla velit velit, + feugiat ac ipsum vitae, rutrum vestibulum nisi. Praesent mattis consequat urna sed vehicula. Integer ut luctus libero. Proin quis sagittis mi. + Aenean commodo est diam, non vehicula eros elementum a. Phasellus ut velit massa. Phasellus et bibendum lorem. Morbi consectetur, metus vulputate + convallis efficitur, nunc odio mattis nunc, vitae volutpat orci eros nec ligula. Nulla in laoreet est, id commodo tellus. Morbi id dui vel nunc + eleifend ultricies.

    + +
    +
    + 0% Complete +
    +
    + +
    + + + + + \ No newline at end of file From fd67ebcc48641599ea55d399d56be7edc4a147d6 Mon Sep 17 00:00:00 2001 From: rit_croque Date: Mon, 5 Feb 2024 10:01:57 +0000 Subject: [PATCH 4/5] feat: Add the attribute email to the user --- src/main/java/MessageResources.properties | 1 + src/main/java/com/my_app/App.java | 6 +++--- src/main/java/com/my_app/model/User.java | 17 +++++++++++++--- .../my_app/page/user/save/UserSaveForm.java | 9 +++++++++ .../save/mapper/UserSaveFormToUserMapper.java | 2 +- .../save/mapper/UserToUserSaveFormMapper.java | 1 + .../save/service/UserSaveServiceImpl.java | 8 ++++++++ .../my_app/repo/impl/UserRepositoryImpl.java | 20 ++++++++++--------- src/main/java/com/my_app/utils/UserUtils.java | 8 ++++++++ src/main/webapp/user/list.jsp | 2 ++ src/main/webapp/user/save/form.jsp | 10 +++++++++- src/main/webapp/user/save/js/form.js | 5 +++-- 12 files changed, 70 insertions(+), 19 deletions(-) diff --git a/src/main/java/MessageResources.properties b/src/main/java/MessageResources.properties index a1e7aa0..076b98f 100644 --- a/src/main/java/MessageResources.properties +++ b/src/main/java/MessageResources.properties @@ -4,6 +4,7 @@ form.field.pre-choose=Must choose an option for the {0} first error.common.required=Required error.password.wrong=Wrong password +error.email.wrong=Email is invalid user.not-found.error=User not found user.username-taken.error=Username's already taken diff --git a/src/main/java/com/my_app/App.java b/src/main/java/com/my_app/App.java index 17e71c8..f76eeec 100644 --- a/src/main/java/com/my_app/App.java +++ b/src/main/java/com/my_app/App.java @@ -115,17 +115,17 @@ private void initDbCountriesAndCities(Connection conn) throws SQLException { private void initDbUsers(Connection conn) throws SQLException { try (final Statement stmt = conn.createStatement()) { stmt.executeUpdate( - "CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); + "CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, EMAIL VARCHAR(255), FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); } final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); final UserRepository userRepository = new UserRepositoryImpl(conn, cityRepository); - userRepository.save(new User("admin", "admin", cityRepository.findById((long) this.random.nextInt(49) + 1))); + userRepository.save(new User("admin", "admin", cityRepository.findById((long) this.random.nextInt(49) + 1), "admin@example.com")); for (int i = 1; i < 11; i++) { userRepository.save( - new User("user" + i, "user" + i, cityRepository.findById((long) this.random.nextInt(49) + 1))); + new User("user" + i, "user" + i, cityRepository.findById((long) this.random.nextInt(49) + 1), "user" + i + "@example.com")); } Logger.debug("All users created: {}", userRepository.findAll()); diff --git a/src/main/java/com/my_app/model/User.java b/src/main/java/com/my_app/model/User.java index 05b2167..bc9f212 100644 --- a/src/main/java/com/my_app/model/User.java +++ b/src/main/java/com/my_app/model/User.java @@ -5,23 +5,26 @@ public class User { private String username; private String password; private City city; + private String email; public User() { } - public User(String username, String password, City city) { + public User(String username, String password, City city, String email) { super(); this.username = username; this.password = password; this.city = city; + this.email = email; } - public User(Long id, String username, String password, City city) { + public User(Long id, String username, String password, City city, String email) { super(); this.id = id; this.username = username; this.password = password; this.city = city; + this.email = email; } public Long getId() { @@ -56,13 +59,21 @@ public void setCity(City city) { this.city = city; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public boolean isNew() { return this.id == null; } @Override public String toString() { - return String.format("User [id=%s, username=%s, password=%s, city=%s]", id, username, password, city); + return String.format("User [id=%s, username=%s, password=%s, city=%s, email=%s]", id, username, password, city, email); } } diff --git a/src/main/java/com/my_app/page/user/save/UserSaveForm.java b/src/main/java/com/my_app/page/user/save/UserSaveForm.java index ebd2622..03e4da8 100644 --- a/src/main/java/com/my_app/page/user/save/UserSaveForm.java +++ b/src/main/java/com/my_app/page/user/save/UserSaveForm.java @@ -10,6 +10,7 @@ public class UserSaveForm extends BaseActionForm { private String password; private Long countryId; private Long cityId; + private String email; private String originalUsername; @@ -75,6 +76,14 @@ public boolean isNewUser() { return this.userId == null || this.userId == 0; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public static long getSerialversionuid() { return serialVersionUID; } diff --git a/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java b/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java index 762d42f..f175078 100644 --- a/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java +++ b/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java @@ -11,6 +11,6 @@ public User toUser(UserSaveForm form) { final City city = new City(form.getCityId()); return new User(Long.valueOf(0).equals(form.getUserId()) ? null : form.getUserId(), form.getUsername(), - form.getPassword(), city); + form.getPassword(), city, form.getEmail()); } } diff --git a/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java b/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java index 008c0be..ab44081 100644 --- a/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java +++ b/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java @@ -15,6 +15,7 @@ public UserSaveForm mapTo(User user, UserSaveForm form) { form.setUsername(user.getUsername()); form.setCountryId(user.getCity().getCountry().getId()); form.setCityId(user.getCity().getId()); + form.setEmail(user.getEmail()); return form; } diff --git a/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java b/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java index 3d41923..20e34ec 100644 --- a/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java +++ b/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java @@ -70,6 +70,14 @@ public boolean validate(UserSaveForm form) { form.getActionErrors().add("city", new ActionMessage("error.common.required")); } } + + if (StringUtils.isBlank(form.getEmail())) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.common.required")); + } else if( !UserUtils.emailIsValid( form.getEmail() ) ) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.email.wrong")); + } return isValid; } diff --git a/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java b/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java index 5a8d13d..117087c 100644 --- a/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java +++ b/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java @@ -35,11 +35,12 @@ public User save(User user) { private User create(User user) { try (final PreparedStatement stmt = this.conn - .prepareStatement("INSERT INTO \"USER\" (USERNAME, PASSWORD, CITY_ID) VALUES (?, ?, ?)")) { + .prepareStatement("INSERT INTO \"USER\" (USERNAME, PASSWORD, CITY_ID, EMAIL) VALUES (?, ?, ?, ?)")) { stmt.setString(1, UserUtils.normalizeUsername(user.getUsername())); stmt.setString(2, user.getPassword()); stmt.setLong(3, user.getCity().getId()); + stmt.setString(4, user.getEmail()); stmt.executeUpdate(); @@ -51,12 +52,13 @@ private User create(User user) { private User update(User user) { try (final PreparedStatement stmt = this.conn - .prepareStatement("UPDATE \"USER\" SET USERNAME = ?, PASSWORD = ?, CITY_ID = ? WHERE ID = ?")) { + .prepareStatement("UPDATE \"USER\" SET USERNAME = ?, PASSWORD = ?, CITY_ID = ?, EMAIL = ? WHERE ID = ?")) { stmt.setString(1, UserUtils.normalizeUsername(user.getUsername())); stmt.setString(2, user.getPassword()); stmt.setLong(3, user.getCity().getId()); - stmt.setLong(4, user.getId()); + stmt.setString(4, user.getEmail()); + stmt.setLong(5, user.getId()); stmt.executeUpdate(); @@ -69,14 +71,14 @@ private User update(User user) { @Override public User findById(Long id) { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\" WHERE ID = ?")) { + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\" WHERE ID = ?")) { stmt.setLong(1, id); try (final ResultSet rs = stmt.executeQuery()) { if (rs.next()) { return new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4))); + this.cityRepository.findById(rs.getLong(4)), rs.getString(5)); } } @@ -89,14 +91,14 @@ public User findById(Long id) { @Override public User findByUsername(String username) { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\" WHERE USERNAME = ?")) { + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\" WHERE USERNAME = ?")) { stmt.setString(1, UserUtils.normalizeUsername(username)); try (final ResultSet rs = stmt.executeQuery()) { if (rs.next()) { return new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4))); + this.cityRepository.findById(rs.getLong(4)), rs.getString(5)); } } @@ -109,14 +111,14 @@ public User findByUsername(String username) { @Override public List findAll() { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\""); + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\""); final ResultSet rs = stmt.executeQuery()) { final List users = new LinkedList<>(); while (rs.next()) { users.add(new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4)))); + this.cityRepository.findById(rs.getLong(4)), rs.getString(5))); } return users; diff --git a/src/main/java/com/my_app/utils/UserUtils.java b/src/main/java/com/my_app/utils/UserUtils.java index d163006..3c21e29 100644 --- a/src/main/java/com/my_app/utils/UserUtils.java +++ b/src/main/java/com/my_app/utils/UserUtils.java @@ -3,13 +3,21 @@ import static org.apache.commons.lang3.StringUtils.lowerCase; import static org.apache.commons.lang3.StringUtils.replace; +import java.util.regex.Pattern; + public class UserUtils { private UserUtils() { } + + private static Pattern emailPattern = Pattern.compile("^(.+)@(\\S+)$"); public static String normalizeUsername(String username) { return replace(lowerCase(username), " ", "_"); } + + public static boolean emailIsValid( String email ) { + return emailPattern.matcher(email).matches(); + } } diff --git a/src/main/webapp/user/list.jsp b/src/main/webapp/user/list.jsp index 72bded5..cb52882 100644 --- a/src/main/webapp/user/list.jsp +++ b/src/main/webapp/user/list.jsp @@ -39,6 +39,7 @@ Username Country City + Email Actions @@ -56,6 +57,7 @@ ${user.username} ${user.city.country.name} ${user.city.name} + ${user.email}
    diff --git a/src/main/webapp/user/save/form.jsp b/src/main/webapp/user/save/form.jsp index 3a3f1b4..b1e3c99 100644 --- a/src/main/webapp/user/save/form.jsp +++ b/src/main/webapp/user/save/form.jsp @@ -34,7 +34,7 @@
    -
    + @@ -81,6 +81,14 @@
    + +
    + + +
    + +
    +
    Back diff --git a/src/main/webapp/user/save/js/form.js b/src/main/webapp/user/save/js/form.js index 1585047..052afaa 100644 --- a/src/main/webapp/user/save/js/form.js +++ b/src/main/webapp/user/save/js/form.js @@ -3,7 +3,7 @@ */ let form = { - $form: $('form#user-save-fome'), + $form: $('form#user-save-form'), $action: $('input[name="action"]'), user: { @@ -11,7 +11,8 @@ let form = { $username: $('input#user-username'), $password: $('input#user-password'), $country: $('select#user-country'), - $city: $('select#user-city') + $city: $('select#user-city'), + $email: $('input#user-email'), }, btn: { From e29c42dd7bdea84072c0bfb369ad86eedf41694e Mon Sep 17 00:00:00 2001 From: rit_croque Date: Mon, 5 Feb 2024 14:10:34 +0000 Subject: [PATCH 5/5] feat: Add the company area --- src/main/java/MessageResources.properties | 7 + src/main/java/com/my_app/App.java | 30 +++ src/main/java/com/my_app/model/Company.java | 86 ++++++++ .../company/delete/CompanyDeleteAction.java | 73 +++++++ .../page/company/list/CompanyListAction.java | 34 ++++ .../page/company/save/CompanySaveAction.java | 109 ++++++++++ .../page/company/save/CompanySaveForm.java | 87 ++++++++ .../CompanySaveFormToCompanyMapper.java | 16 ++ .../CompanyToCompanySaveFormMapper.java | 24 +++ .../com/my_app/repo/CompanyRepository.java | 11 + .../repo/impl/CompanyRepositoryImpl.java | 190 ++++++++++++++++++ .../com/my_app/service/CompanyService.java | 22 ++ .../factory/CompanyServiceFactory.java | 21 ++ .../service/impl/CompanyServiceImpl.java | 127 ++++++++++++ src/main/webapp/WEB-INF/struts-config.xml | 9 + src/main/webapp/company/list.jsp | 77 +++++++ src/main/webapp/company/save/form.jsp | 105 ++++++++++ src/main/webapp/company/save/js/form.js | 74 +++++++ src/main/webapp/home.jsp | 7 +- src/main/webapp/incl/header.jsp | 4 +- 20 files changed, 1111 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/my_app/model/Company.java create mode 100644 src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java create mode 100644 src/main/java/com/my_app/page/company/list/CompanyListAction.java create mode 100644 src/main/java/com/my_app/page/company/save/CompanySaveAction.java create mode 100644 src/main/java/com/my_app/page/company/save/CompanySaveForm.java create mode 100644 src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java create mode 100644 src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java create mode 100644 src/main/java/com/my_app/repo/CompanyRepository.java create mode 100644 src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java create mode 100644 src/main/java/com/my_app/service/CompanyService.java create mode 100644 src/main/java/com/my_app/service/factory/CompanyServiceFactory.java create mode 100644 src/main/java/com/my_app/service/impl/CompanyServiceImpl.java create mode 100644 src/main/webapp/company/list.jsp create mode 100644 src/main/webapp/company/save/form.jsp create mode 100644 src/main/webapp/company/save/js/form.js diff --git a/src/main/java/MessageResources.properties b/src/main/java/MessageResources.properties index 076b98f..dba79cf 100644 --- a/src/main/java/MessageResources.properties +++ b/src/main/java/MessageResources.properties @@ -13,3 +13,10 @@ user.delete.at-least-one.error=Must keep at least one user user.create.success=User "{0}" was created successfully user.update.success=User "{0}" was update successfully user.delete.success=User "{0}" was deleted successfully + +company.not-found.error=Company not found +company.delete.at-least-one.error=Must keep at least one company + +company.create.success=Company "{0}" was created successfully +company.update.success=Company "{0}" was update successfully +company.delete.success=Company "{0}" was deleted successfully \ No newline at end of file diff --git a/src/main/java/com/my_app/App.java b/src/main/java/com/my_app/App.java index f76eeec..2905c9c 100644 --- a/src/main/java/com/my_app/App.java +++ b/src/main/java/com/my_app/App.java @@ -15,17 +15,30 @@ import com.my_app.db.DataSourceFactory; import com.my_app.exception.AppGenericException; import com.my_app.model.City; +import com.my_app.model.Company; import com.my_app.model.Country; import com.my_app.model.User; import com.my_app.repo.CityRepository; import com.my_app.repo.CountryRepository; import com.my_app.repo.UserRepository; +import com.my_app.repo.CompanyRepository; import com.my_app.repo.impl.CityRepositoryImpl; import com.my_app.repo.impl.CountryRepositoryImpl; import com.my_app.repo.impl.UserRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; public class App { + private static final String CREATE_STATEMENT = "" + + "CREATE TABLE \"COMPANY\" (" + + " ID IDENTITY NOT NULL PRIMARY KEY, " + + " NAME VARCHAR(255) NOT NULL, " + + " ADDRESS VARCHAR(255) NOT NULL, " + + " VAT VARCHAR(255), " + + " CITY_ID BIGINT NOT NULL, " + + " FOREIGN KEY (CITY_ID) REFERENCES CITY(ID)" + + ")"; + private static App instance; private final Context context; @@ -81,11 +94,28 @@ private void initDb() { try (final Connection conn = this.dataSource.getConnection()) { initDbCountriesAndCities(conn); initDbUsers(conn); + initDbCompanies(conn); } catch (SQLException e) { throw new AppGenericException("Error trying to insert initial db data", e); } } + private void initDbCompanies(Connection conn) throws SQLException { + try (final Statement stmt = conn.createStatement()) { + stmt.executeUpdate(CREATE_STATEMENT); + } + + final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); + final CompanyRepository companyRepository = new CompanyRepositoryImpl(conn, cityRepository); + + for (int i = 1; i < 11; i++) { + companyRepository.save( + new Company("company" + i, "Street " + i, "vat" + i, cityRepository.findById((long) this.random.nextInt(49) + 1))); + } + + Logger.debug("All companies created: {}", companyRepository.findAll()); + } + private void initDbCountriesAndCities(Connection conn) throws SQLException { try (final Statement stmt = conn.createStatement()) { stmt.executeUpdate( diff --git a/src/main/java/com/my_app/model/Company.java b/src/main/java/com/my_app/model/Company.java new file mode 100644 index 0000000..12355c7 --- /dev/null +++ b/src/main/java/com/my_app/model/Company.java @@ -0,0 +1,86 @@ +package com.my_app.model; + +import java.io.Serializable; + +public class Company implements Serializable { + + private static final long serialVersionUID = 5540957701837095980L; + + private Long id; + + private String name; + + private String address; + + private String vat; + + private City city; + + public Company() { + super(); + } + + public Company(String name, String address, String vat, City city) { + super(); + this.name = name; + this.address = address; + this.vat = vat; + this.city = city; + } + + public Company(Long id, String name, String address, String vat, City city) { + super(); + this.id = id; + this.name = name; + this.address = address; + this.vat = vat; + this.city = city; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getVat() { + return vat; + } + + public void setVat(String vat) { + this.vat = vat; + } + + public City getCity() { + return city; + } + + public void setCity(City city) { + this.city = city; + } + + @Override + public String toString() { + return String.format("Company [id=%s, name=%s, address=%s, vat=%s, city=%s]", id, name, address, vat, + city); + } + +} diff --git a/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java new file mode 100644 index 0000000..fdf072f --- /dev/null +++ b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java @@ -0,0 +1,73 @@ +package com.my_app.page.company.delete; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import com.my_app.model.Company; +import com.my_app.service.CompanyService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanyDeleteAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + + final ActionMessages actionMessages = new ActionMessages(); + final ActionErrors actionErrors = new ActionErrors(); + + final CompanyService companyService = new CompanyServiceFactory().create((Connection) req.getAttribute("conn")); + + if (companyService.hasCompanies()) { + + final String companyIdStr = req.getParameter("companyId"); + + if (StringUtils.isNotBlank(companyIdStr)) { + final Long companyId = Long.valueOf(companyIdStr); + + final Company company = companyService.findById(companyId); + + if (company != null) { + companyService.delete(company); + + actionMessages.add("topMsgs", new ActionMessage("company.delete.success", company.getName())); + } else { + actionErrors.add("topErrors", new ActionMessage("company.not-found.error")); + } + } else { + actionErrors.add("topErrors", new ActionMessage("company.not-found.error")); + } + + } else { + actionErrors.add("topErrors", new ActionMessage("company.delete.at-least-one.error")); + this.saveErrors(req, actionErrors); + } + + if (!actionMessages.isEmpty()) { + req.setAttribute("actionMessages", actionMessages); + this.saveMessages(req, actionMessages); + } else if (!actionErrors.isEmpty()) { + req.setAttribute("actionErrors", actionErrors); + this.saveErrors(req, actionErrors); + } + + return mapping.findForward("actionCompanies"); + } + +} diff --git a/src/main/java/com/my_app/page/company/list/CompanyListAction.java b/src/main/java/com/my_app/page/company/list/CompanyListAction.java new file mode 100644 index 0000000..7aa533e --- /dev/null +++ b/src/main/java/com/my_app/page/company/list/CompanyListAction.java @@ -0,0 +1,34 @@ +package com.my_app.page.company.list; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import com.my_app.service.CompanyService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanyListAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + + final CompanyService companyService = new CompanyServiceFactory().create((Connection) req.getAttribute("conn")); + + req.setAttribute("companies", companyService.findAll()); + + return mapping.getInputForward(); + } + +} diff --git a/src/main/java/com/my_app/page/company/save/CompanySaveAction.java b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java new file mode 100644 index 0000000..130281d --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java @@ -0,0 +1,109 @@ +package com.my_app.page.company.save; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; + +import com.my_app.model.Company; +import com.my_app.service.CompanyService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanySaveAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + final Connection conn = (Connection) req.getAttribute("conn"); + final CompanyService companyService = new CompanyServiceFactory().create(conn); + + final CompanySaveForm form = (CompanySaveForm) actionForm; + + req.setAttribute("form", form); + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("loginRedir"); + } else if ("save".equals(form.getAction())) { + return executeSaveAction(mapping, form, req, res, companyService); + } else if ("validate".equals(form.getAction())) { + return executeValidateAction(mapping, form, req, res, companyService); + } else { + return this.executeFormAction(mapping, form, req, res, companyService); + } + } + + private ActionForward executeFormAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanyService companyService) { + + if (form.isFormInit()) { + companyService.formInit(form); + form.setFormInit(false); + } + + companyService.setRequestAttrs(form, req); + + return mapping.findForward("form"); + } + + private ActionForward executeValidateAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanyService companyService) { + + if (companyService.validate(form)) { + form.getActionMessages().add("topMsgs", new ActionMessage("form.validation.success", form.getName())); + } else { + form.getActionErrors().add("topMsgs", new ActionMessage("form.validation.error")); + } + + if (!form.getActionMessages().isEmpty()) { + req.setAttribute("actionMessages", form.getActionMessages()); + this.saveMessages(req, form.getActionMessages()); + } else if (!form.getActionErrors().isEmpty()) { + req.setAttribute("actionErrors", form.getActionErrors()); + this.saveErrors(req, form.getActionErrors()); + } + + req.setAttribute("validated", true); + + return this.executeFormAction(mapping, form, req, res, companyService); + } + + private ActionForward executeSaveAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanyService companyService) { + + ActionForward actionForward; + + if (companyService.validate(form)) { + final Company company = companyService.saveCompany(form); + + if (form.isNewCompany()) { + form.getActionMessages().add("topMsgs", new ActionMessage("company.create.success", company.getName())); + } else { + form.getActionMessages().add("topMsgs", new ActionMessage("company.update.success", company.getName())); + } + + actionForward = mapping.findForward("actionCompanies"); + } else { + form.getActionErrors().add("topMsgs", new ActionMessage("form.validation.error")); + req.setAttribute("validated", true); + + actionForward = this.executeFormAction(mapping, form, req, res, companyService); + } + + if (!form.getActionMessages().isEmpty()) { + req.setAttribute("actionMessages", form.getActionMessages()); + this.saveMessages(req, form.getActionMessages()); + } else if (!form.getActionErrors().isEmpty()) { + req.setAttribute("actionErrors", form.getActionErrors()); + this.saveErrors(req, form.getActionErrors()); + } + + return actionForward; + } +} diff --git a/src/main/java/com/my_app/page/company/save/CompanySaveForm.java b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java new file mode 100644 index 0000000..8c38a08 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java @@ -0,0 +1,87 @@ +package com.my_app.page.company.save; + +import com.my_app.model.BaseActionForm; + +public class CompanySaveForm extends BaseActionForm { + private static final long serialVersionUID = 3648004327226250285L; + + private Long companyId; + private String name; + private String address; + private String vat; + private Long countryId; + private Long cityId; + + private String originalName; + + private transient boolean formInit = true; + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getVat() { + return vat; + } + + public void setVat(String vat) { + this.vat = vat; + } + + public Long getCountryId() { + return countryId; + } + + public void setCountryId(Long countryId) { + this.countryId = countryId; + } + + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public String getOriginalName() { + return originalName; + } + + public void setOriginalName(String originalName) { + this.originalName = originalName; + } + + public boolean isFormInit() { + return formInit; + } + + public void setFormInit(boolean formInit) { + this.formInit = formInit; + } + + public boolean isNewCompany() { + return this.companyId == null || this.companyId == 0; + } + +} diff --git a/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java b/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java new file mode 100644 index 0000000..795d2ed --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java @@ -0,0 +1,16 @@ +package com.my_app.page.company.save.mapper; + +import com.my_app.model.City; +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public class CompanySaveFormToCompanyMapper { + + public Company toCompany(CompanySaveForm form) { + + final City city = new City(form.getCityId()); + + return new Company(Long.valueOf(0).equals(form.getCompanyId()) ? null : form.getCompanyId(), form.getName(), + form.getAddress(), form.getVat(), city); + } +} diff --git a/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java new file mode 100644 index 0000000..4fb7888 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java @@ -0,0 +1,24 @@ +package com.my_app.page.company.save.mapper; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public class CompanyToCompanySaveFormMapper { + + public CompanySaveForm toCompanySaveForm(Company company) { + return this.mapTo(company, new CompanySaveForm()); + } + + public CompanySaveForm mapTo(Company company, CompanySaveForm form) { + + form.setCompanyId(company.getId()); + form.setName(company.getName()); + form.setCountryId(company.getCity().getCountry().getId()); + form.setCityId(company.getCity().getId()); + form.setAddress(company.getAddress()); + form.setVat(company.getVat()); + + return form; + } + +} diff --git a/src/main/java/com/my_app/repo/CompanyRepository.java b/src/main/java/com/my_app/repo/CompanyRepository.java new file mode 100644 index 0000000..39bf78e --- /dev/null +++ b/src/main/java/com/my_app/repo/CompanyRepository.java @@ -0,0 +1,11 @@ +package com.my_app.repo; + +import com.my_app.model.Company; + +public interface CompanyRepository extends Repository { + + Company findByName( String name ); + + boolean hasCompanies(); + +} diff --git a/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java new file mode 100644 index 0000000..cfe2518 --- /dev/null +++ b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java @@ -0,0 +1,190 @@ +package com.my_app.repo.impl; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import com.my_app.exception.AppGenericException; +import com.my_app.model.Company; +import com.my_app.repo.CityRepository; +import com.my_app.repo.CompanyRepository; + +public class CompanyRepositoryImpl implements CompanyRepository { + + private static final String COUNT_STATEMENT = "" + + "SELECT count(*) FROM \"COMPANY\""; + + private static final String DELETE_STATEMENT = "DELETE \"COMPANY\" WHERE ID = ?"; + + private static final String SELECT_ALL_STATEMENT = "" + + "SELECT ID, NAME, ADDRESS, VAT, CITY_ID " + + "FROM \"COMPANY\" "; + + private static final String SELECT_BY_NAME = "" + + "SELECT ID, NAME, ADDRESS, VAT, CITY_ID " + + "FROM \"COMPANY\" " + + "WHERE NAME = ?"; + + private static final String SELECT_BY_ID_STATEMENT = "" + + "SELECT ID, NAME, ADDRESS, VAT, CITY_ID " + + "FROM \"COMPANY\" " + + "WHERE ID = ?"; + + private static final String UPDATE_STATEMENT = "" + + "UPDATE \"COMPANY\" " + + "SET NAME = ?, ADDRESS = ?, VAT = ?, CITY_ID = ? " + + "WHERE ID = ?"; + + private static final String INSERT_STATMENT = "" + + "INSERT INTO \"COMPANY\" " + + "(NAME, ADDRESS, VAT, CITY_ID ) " + + "VALUES " + + "(?, ?, ?, ?)"; + + private final Connection conn; + private final CityRepository cityRepository; + + public CompanyRepositoryImpl(Connection conn, CityRepository cityRepository) { + super(); + this.conn = conn; + this.cityRepository = cityRepository; + } + + @Override + public Company save(Company company) { + if( null == company.getId() ) { + return this.create(company); + } + return this.update(company); + } + + private Company create(Company company) { + try (final PreparedStatement stmt = this.conn + .prepareStatement(INSERT_STATMENT)) { + + stmt.setString(1, company.getName()); + stmt.setString(2, company.getAddress()); + stmt.setString(3, company.getVat()); + stmt.setLong(4, company.getCity().getId()); + + stmt.executeUpdate(); + + return this.findByName(company.getName()); + } catch (SQLException e) { + throw new AppGenericException("Error while inserting company", e); + } + } + + private Company update(Company company) { + try (final PreparedStatement stmt = this.conn + .prepareStatement(UPDATE_STATEMENT)) { + + stmt.setString(1, company.getName()); + stmt.setString(2, company.getAddress()); + stmt.setString(3, company.getVat()); + stmt.setLong(4, company.getCity().getId()); + stmt.setLong(5, company.getId()); + + stmt.executeUpdate(); + + return this.findByName(company.getName()); + } catch (SQLException e) { + throw new AppGenericException("Error while updating company", e); + } + } + + @Override + public Company findById(Long id) { + try (final PreparedStatement stmt = this.conn + .prepareStatement(SELECT_BY_ID_STATEMENT)) { + + stmt.setLong(1, id); + + try (final ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + return new Company(rs.getLong(1), rs.getString(2), rs.getString(3), + rs.getString(4), this.cityRepository.findById(rs.getLong(5))); + } + } + return null; + } catch (SQLException e) { + throw new AppGenericException("Error while querying by id for company", e); + } + } + + @Override + public List findAll() { + try (final PreparedStatement stmt = this.conn + .prepareStatement(SELECT_ALL_STATEMENT); + final ResultSet rs = stmt.executeQuery()) { + + final List companies = new ArrayList<>(); + + while (rs.next()) { + companies.add(new Company(rs.getLong(1), rs.getString(2), rs.getString(3), + rs.getString(4), this.cityRepository.findById(rs.getLong(5)))); + } + + return companies; + } catch (SQLException e) { + throw new AppGenericException("Error while querying for all companies", e); + } + } + + @Override + public void deleteById(Long id) { + try (final PreparedStatement stmt = this.conn.prepareStatement(DELETE_STATEMENT)) { + stmt.setLong(1, id); + stmt.executeUpdate(); + } catch (SQLException e) { + throw new AppGenericException("Error while deleting for company", e); + } + } + + @Override + public void delete(Company company) { + this.deleteById(company.getId()); + } + + @Override + public Company findByName(String name) { + try (final PreparedStatement stmt = this.conn + .prepareStatement(SELECT_BY_NAME)) { + + stmt.setString(1, name); + + try (final ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + return new Company(rs.getLong(1), rs.getString(2), rs.getString(3), + rs.getString(4), this.cityRepository.findById(rs.getLong(5))); + } + } + + return null; + } catch (SQLException e) { + throw new AppGenericException("Error while querying by name for company", e); + } + } + + @Override + public boolean hasCompanies() { + try (final PreparedStatement stmt = this.conn + .prepareStatement(COUNT_STATEMENT); + final ResultSet rs = stmt.executeQuery()) { + + boolean result = false; + + while (rs.next()) { + result = rs.getLong(1) > 0; + } + + return result; + } catch (SQLException e) { + throw new AppGenericException("Error while counting all companies", e); + } + } + +} diff --git a/src/main/java/com/my_app/service/CompanyService.java b/src/main/java/com/my_app/service/CompanyService.java new file mode 100644 index 0000000..815fb2b --- /dev/null +++ b/src/main/java/com/my_app/service/CompanyService.java @@ -0,0 +1,22 @@ +package com.my_app.service; + +import javax.servlet.http.HttpServletRequest; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public interface CompanyService extends BaseService { + + Company findByName(String name); + + boolean hasCompanies(); + + public boolean validate(CompanySaveForm form); + + public Company saveCompany(CompanySaveForm form); + + public void formInit(CompanySaveForm form); + + public void setRequestAttrs(CompanySaveForm form, HttpServletRequest req); + +} diff --git a/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java b/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java new file mode 100644 index 0000000..745ffcb --- /dev/null +++ b/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java @@ -0,0 +1,21 @@ +package com.my_app.service.factory; + +import java.sql.Connection; + +import com.my_app.repo.impl.CityRepositoryImpl; +import com.my_app.repo.impl.CountryRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; +import com.my_app.service.CompanyService; +import com.my_app.service.impl.CompanyServiceImpl; + +public class CompanyServiceFactory implements ConnectionBasedServiceFactory { + + @Override + public CompanyService create(Connection conn) { + return new CompanyServiceImpl( + new CompanyRepositoryImpl(conn, new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn))), + new CountryServiceFactory().create(conn), + new CityServiceFactory().create(conn)); + } + +} diff --git a/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..619eeda --- /dev/null +++ b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java @@ -0,0 +1,127 @@ +package com.my_app.service.impl; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts.action.ActionMessage; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; +import com.my_app.page.company.save.mapper.CompanySaveFormToCompanyMapper; +import com.my_app.page.company.save.mapper.CompanyToCompanySaveFormMapper; +import com.my_app.repo.CompanyRepository; +import com.my_app.service.CityService; +import com.my_app.service.CompanyService; +import com.my_app.service.CountryService; + +public class CompanyServiceImpl implements CompanyService { + + private final CompanyRepository companyRepository; + private CountryService countryService; + private CityService cityService; + + public CompanyServiceImpl(CompanyRepository companyRepository, CountryService countryService, CityService cityService) { + this.companyRepository = companyRepository; + this.countryService = countryService; + this.cityService = cityService; + } + + @Override + public Company save(Company company) { + return this.companyRepository.save(company); + } + + @Override + public Company findById(Long id) { + return this.companyRepository.findById(id); + } + + @Override + public Company findByName(String name) { + return this.companyRepository.findByName(name); + } + + @Override + public List findAll() { + return this.companyRepository.findAll(); + } + + @Override + public void deleteById(Long id) { + this.companyRepository.deleteById(id); + } + + @Override + public void delete(Company company) { + this.deleteById(company.getId()); + } + + @Override + public boolean hasCompanies() { + return this.companyRepository.hasCompanies(); + } + + @Override + public void formInit(CompanySaveForm form) { + if (!form.isNewCompany()) { + final Company company = this.findById(form.getCompanyId()); + + new CompanyToCompanySaveFormMapper().mapTo(company, form); + form.setOriginalName(form.getName()); + } + } + + @Override + public boolean validate(CompanySaveForm form) { + boolean isValid = true; + + if (StringUtils.isBlank(form.getName())) { + isValid = false; + form.getActionErrors().add("name", new ActionMessage("error.common.required")); + } + + if (StringUtils.isBlank(form.getAddress())) { + isValid = false; + form.getActionErrors().add("address", new ActionMessage("error.common.required")); + } + + if (form.getCountryId() == null || form.getCountryId() == 0) { + isValid = false; + form.getActionErrors().add("country", new ActionMessage("error.common.required")); + } + + if (form.getCityId() == null || form.getCityId() == 0) { + isValid = false; + + if (form.getCountryId() == null || form.getCountryId() == 0) { + form.getActionErrors().add("city", new ActionMessage("form.field.pre-choose", "Country")); + } else { + form.getActionErrors().add("city", new ActionMessage("error.common.required")); + } + } + + if (StringUtils.isBlank(form.getVat())) { + isValid = false; + form.getActionErrors().add("vat", new ActionMessage("error.common.required")); + } + + return isValid; + } + + @Override + public Company saveCompany(CompanySaveForm form) { + return this.save(new CompanySaveFormToCompanyMapper().toCompany(form)); + } + + @Override + public void setRequestAttrs(CompanySaveForm form, HttpServletRequest req) { + req.setAttribute("countries", this.countryService.findAll()); + + if (form.getCountryId() != null && form.getCountryId() > 0) { + req.setAttribute("cities", this.cityService.findAllByCountryId(form.getCountryId())); + } + } + +} diff --git a/src/main/webapp/WEB-INF/struts-config.xml b/src/main/webapp/WEB-INF/struts-config.xml index 8810f1e..8c0b7c9 100644 --- a/src/main/webapp/WEB-INF/struts-config.xml +++ b/src/main/webapp/WEB-INF/struts-config.xml @@ -6,6 +6,7 @@ + @@ -13,6 +14,8 @@ + + @@ -32,6 +35,12 @@ + + + + + + diff --git a/src/main/webapp/company/list.jsp b/src/main/webapp/company/list.jsp new file mode 100644 index 0000000..3d5a1b2 --- /dev/null +++ b/src/main/webapp/company/list.jsp @@ -0,0 +1,77 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> +<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic"%> + + + + + + +Companies - MyApp + + + + +
    +

    Companies

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IdNameAddressCityVatActions
    No companies
    ${company.id}${company.name}${company.address}${company.city.name} - ${company.city.country.name}${company.vat} +
    + +
    +
    + New +
    + + + + \ No newline at end of file diff --git a/src/main/webapp/company/save/form.jsp b/src/main/webapp/company/save/form.jsp new file mode 100644 index 0000000..1764f81 --- /dev/null +++ b/src/main/webapp/company/save/form.jsp @@ -0,0 +1,105 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> +<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic"%> + + + + + + +Companies - MyApp + + + + +
    +

    ${form.newCompany ? 'New' : 'Update'} Company ${form.newCompany ? '' : form.name}

    + + + + + + + + +
    +
    + + + + + + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + + Back + + + +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/src/main/webapp/company/save/js/form.js b/src/main/webapp/company/save/js/form.js new file mode 100644 index 0000000..3ca53c5 --- /dev/null +++ b/src/main/webapp/company/save/js/form.js @@ -0,0 +1,74 @@ +/** + * + */ + +let form = { + $form: $('form#company-save-form'), + $action: $('input[name="action"]'), + + company: { + $id: $('input#company-id'), + $name: $('input#company-name'), + $address: $('input#company-address'), + $country: $('select#company-country'), + $city: $('select#company-city'), + $vat: $('input#company-vat'), + }, + + btn: { + $validate: $('button.btn-validate'), + $save: $('button.btn-save') + }, + +} + + +let btnValidateClickHandler = (event) => { + event.preventDefault(); + console.debug('btn validate clicked'); + form.$action.val('validate'); + form.$form.submit(); +} + +let btnSaveClickHandler = (event) => { + event.preventDefault(); + console.debug('btn save clicked'); + form.$action.val('save'); + form.$form.submit(); +} + +let countryChangeHandler = () => { + let $country = form.company.$country; + let $city = form.company.$city; + + $city.prop('disabled', true).val('').empty().append($(``)); + + if ($country.val()) { + let countryId = Number($country.val()); + + cityService.findAllByCountryId(countryId).done((cities) => { + console.debug(cities); + + if (cities != null && cities.length > 0) { + $city.prop('disabled', false); + cities.forEach((city) => { + $city.append($(``)); + }); + } + }) + } +} + +let main = () => { + + form.btn.$validate.on('click', btnValidateClickHandler); + form.btn.$save.on('click', btnSaveClickHandler); + + form.company.$country.on('change', countryChangeHandler) + + console.debug('form.js initialized'); +} + +$(() => { + main(); +}) \ No newline at end of file diff --git a/src/main/webapp/home.jsp b/src/main/webapp/home.jsp index 22922db..a9b2d64 100644 --- a/src/main/webapp/home.jsp +++ b/src/main/webapp/home.jsp @@ -18,11 +18,16 @@

    Welcome to MyApp

    Choose an area

    -
    +

    Users
    +
    +
    + Companies +     +
    diff --git a/src/main/webapp/incl/header.jsp b/src/main/webapp/incl/header.jsp index 1d5f026..729741e 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -27,7 +27,9 @@
    • +
  • Companies
    • + +