diff --git a/.classpath b/.classpath index ddeaa5b..d1f331c 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,40 @@ - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 26aeb57..6d8ea42 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ hs_err_pid* replay_pid* /build/ +/target/ diff --git a/.project b/.project index f106b83..3e1c267 100644 --- a/.project +++ b/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2c6240c..a6fee6f 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -10,6 +10,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..7103be7 --- /dev/null +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index f14ca0e..7e12d97 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,15 @@ - + + + + + + - + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.wst.validation.prefs similarity index 54% rename from .settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.wst.validation.prefs index 99f26c0..04cad8c 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.wst.validation.prefs @@ -1,2 +1,2 @@ +disabled=06target eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d0426e9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + java7-struts1-jquery-bootstrap3-web-project + java7-struts1-jquery-bootstrap3-web-project + 0.0.1-SNAPSHOT + war + + + org.apache.struts + struts-core + 1.3.8 + + + org.tinylog + tinylog-api + 2.6.2 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + org.apache.commons + commons-lang3 + 3.12.0 + + + com.google.code.gson + gson + 2.10.1 + + + com.h2database + h2 + 2.2.224 + + + + + + src/main/java + + **/*.java + + + + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + + \ No newline at end of file diff --git a/src/main/java/MessageResources.properties b/src/main/java/MessageResources.properties index a1e7aa0..4780dea 100644 --- a/src/main/java/MessageResources.properties +++ b/src/main/java/MessageResources.properties @@ -8,7 +8,18 @@ error.password.wrong=Wrong password user.not-found.error=User not found user.username-taken.error=Username's already taken user.delete.at-least-one.error=Must keep at least one user +user.email.error=Email's not valid 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.name-taken.error=Name's already taken +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 diff --git a/src/main/java/com/my_app/App.java b/src/main/java/com/my_app/App.java index 17e71c8..ac7baa4 100644 --- a/src/main/java/com/my_app/App.java +++ b/src/main/java/com/my_app/App.java @@ -15,12 +15,15 @@ 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.CompanyRepository; import com.my_app.repo.CountryRepository; import com.my_app.repo.UserRepository; import com.my_app.repo.impl.CityRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; import com.my_app.repo.impl.CountryRepositoryImpl; import com.my_app.repo.impl.UserRepositoryImpl; @@ -81,6 +84,7 @@ private void initDb() { try (final Connection conn = this.dataSource.getConnection()) { initDbCountriesAndCities(conn); initDbUsers(conn); + createDbCompanies(conn); } catch (SQLException e) { throw new AppGenericException("Error trying to insert initial db data", e); } @@ -115,7 +119,7 @@ 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) NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); } final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); @@ -130,5 +134,23 @@ private void initDbUsers(Connection conn) throws SQLException { Logger.debug("All users created: {}", userRepository.findAll()); } + + private void createDbCompanies(Connection conn) throws SQLException { + try (final Statement stmt = conn.createStatement()) { + stmt.executeUpdate( + "CREATE TABLE \"COMPANY\" (ID IDENTITY NOT NULL PRIMARY KEY, NAME VARCHAR(255) UNIQUE NOT NULL, ADDRESS VARCHAR(255) NOT NULL, VAT BIGINT NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); + } + + final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); + final CompanyRepository companyRepository = new CompanyRepositoryImpl(conn, cityRepository); + + for (int i = 1; i < 5; i++) { + companyRepository.save( + new Company("company_name" + i, "address_company" + i, 1 + this.random.nextLong(49) + 1, cityRepository.findById((long) this.random.nextInt(49) + 1))); + } + + Logger.debug("All comapny created: {}", companyRepository.findAll()); + + } } 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..1c43889 --- /dev/null +++ b/src/main/java/com/my_app/model/Company.java @@ -0,0 +1,81 @@ +package com.my_app.model; + +public class Company { + + private Long id; + private String name; + private String address; + private Long vat; + private City city; + + public Company() { + super(); + } + + public Company(String name, String address, Long vat, City city) { + super(); + this.name = name; + this.address = address; + this.vat = vat; + this.city = city; + } + public Company(Long id, String name, String address, Long 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 Long getVat() { + return vat; + } + + public void setVat(Long vat) { + this.vat = vat; + } + + public City getCity() { + return city; + } + + public void setCity(City city) { + this.city = city; + } + + public String getAddress() { + return address; + } + + public String setAddress(String address) { + return address; + } + + public boolean isNew() { + return this.id == null; + } + + @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/model/User.java b/src/main/java/com/my_app/model/User.java index 05b2167..f94e334 100644 --- a/src/main/java/com/my_app/model/User.java +++ b/src/main/java/com/my_app/model/User.java @@ -4,6 +4,7 @@ public class User { private Long id; private String username; private String password; + private String email; private City city; public User() { @@ -16,12 +17,13 @@ public User(String username, String password, City city) { this.city = city; } - 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() { @@ -59,10 +61,19 @@ public void setCity(City city) { public boolean isNew() { return this.id == null; } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } @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/company/delete/CompanyDeleteAction.java b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java new file mode 100644 index 0000000..82af2a0 --- /dev/null +++ b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java @@ -0,0 +1,75 @@ +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")); + + final int totalCompaniesCount = companyService.findAll().size(); + + if (totalCompaniesCount - 1 != 0) { + + 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..fb0b299 --- /dev/null +++ b/src/main/java/com/my_app/page/company/list/CompanyListAction.java @@ -0,0 +1,36 @@ +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.UserService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.service.factory.UserServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanyListAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest req, + HttpServletResponse response) 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..a19d1c5 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java @@ -0,0 +1,113 @@ +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.model.User; +import com.my_app.page.company.save.service.CompanySaveService; +import com.my_app.page.company.save.service.CompanySaveServiceFactory; +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 CompanySaveService companySaveService = new CompanySaveServiceFactory().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, companySaveService); + } else if ("validate".equals(form.getAction())) { + return executeValidateAction(mapping, form, req, res, companySaveService); + } else { + return this.executeFormAction(mapping, form, req, res, companySaveService); + } + } + + private ActionForward executeFormAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + if (form.isFormInit()) { + companySaveService.formInit(form); + form.setFormInit(false); + } + companySaveService.setRequestAttrs(form, req); + return mapping.findForward("form"); + } + + private ActionForward executeValidateAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + + if (companySaveService.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, companySaveService); + } + + private ActionForward executeSaveAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + + ActionForward actionForward; + + if (companySaveService.validate(form)) { + final Company company = companySaveService.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, companySaveService); + } + + 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..77cd351 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java @@ -0,0 +1,77 @@ +package com.my_app.page.company.save; + +import com.my_app.model.BaseActionForm; + +public class CompanySaveForm extends BaseActionForm { + + private static final long serialVersionUID = 3269397173691017817L; + + private Long companyId; + private String name; + private String address; + private Long vat; + private Long cityId; + private Long countryId; + + private transient boolean formInit = true; + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long id) { + this.companyId = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getVat() { + return vat; + } + + public void setVat(Long vat) { + this.vat = vat; + } + + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public Long getCountryId() { + return countryId; + } + + public void setCountryId(Long countryId) { + this.countryId = countryId; + } + + public boolean isFormInit() { + return formInit; + } + + public void setFormInit(boolean formInit) { + this.formInit = formInit; + } + + public boolean isNewCompany() { + return this.companyId == null || this.companyId == 0; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } +} 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..b4e4412 --- /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..30d5c7a --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java @@ -0,0 +1,20 @@ +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 mapTo(Company company, CompanySaveForm form) { + + form.setCompanyId(company.getId()); + form.setName(company.getName()); + form.setAddress(company.getAddress()); + form.setCityId(company.getCity().getId()); + form.setVat(company.getVat()); + form.setCountryId(company.getCity().getCountry().getId()); + + return form; + } + +} diff --git a/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java new file mode 100644 index 0000000..0d3bb2d --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java @@ -0,0 +1,18 @@ +package com.my_app.page.company.save.service; + +import javax.servlet.http.HttpServletRequest; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public interface CompanySaveService { + + 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/page/company/save/service/CompanySaveServiceFactory.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceFactory.java new file mode 100644 index 0000000..a02cb87 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceFactory.java @@ -0,0 +1,17 @@ +package com.my_app.page.company.save.service; + +import java.sql.Connection; + +import com.my_app.service.factory.CityServiceFactory; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.service.factory.ConnectionBasedServiceFactory; +import com.my_app.service.factory.CountryServiceFactory; + +public class CompanySaveServiceFactory implements ConnectionBasedServiceFactory { + + @Override + public CompanySaveService create(Connection conn) { + return new CompanySaveServiceImpl(new CompanyServiceFactory().create(conn), + new CountryServiceFactory().create(conn), new CityServiceFactory().create(conn)); + } +} \ No newline at end of file diff --git a/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java new file mode 100644 index 0000000..9f5370f --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java @@ -0,0 +1,97 @@ +package com.my_app.page.company.save.service; + +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.model.User; +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.page.user.save.mapper.UserSaveFormToUserMapper; +import com.my_app.page.user.save.mapper.UserToUserSaveFormMapper; +import com.my_app.service.CityService; +import com.my_app.service.CompanyService; +import com.my_app.service.CountryService; + +public class CompanySaveServiceImpl implements CompanySaveService { + + + final CompanyService companyService; + final CountryService countryService; + final CityService cityService; + + public CompanySaveServiceImpl(CompanyService companyService, CountryService countryService, CityService cityService) { + super(); + this.companyService = companyService; + this.countryService = countryService; + this.cityService = cityService; + } + + @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.getVat() == null || form.getVat() == 0) { + isValid = false; + form.getActionErrors().add("vat", 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")); + } + } + + return isValid; + } + + @Override + public Company saveCompany(CompanySaveForm form) { + return this.companyService.save(new CompanySaveFormToCompanyMapper().toCompany(form)); + } + + @Override + public void formInit(CompanySaveForm form) { + + if (!form.isNewCompany()) { + final Company company = this.companyService.findById(form.getCompanyId()); + new CompanyToCompanySaveFormMapper().mapTo(company, form); + form.setName(form.getName()); + } + + } + + @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/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..7a71e65 --- /dev/null +++ b/src/main/java/com/my_app/page/logout/LogoutAction.java @@ -0,0 +1,27 @@ +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 actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + if (LoginUtils.isUserLoggedIn(req.getSession())) { + req.getSession().setAttribute(AppConstants.SESSION_ATTR_KEY_IS_LOGGED_IN, false); + req.getSession().invalidate(); + return mapping.findForward("actionLoginRedir"); + } else { + return mapping.findForward("homePage"); + } + } +} diff --git a/src/main/java/com/my_app/page/privatePage/PrivatePageAction.java b/src/main/java/com/my_app/page/privatePage/PrivatePageAction.java new file mode 100644 index 0000000..08dff4a --- /dev/null +++ b/src/main/java/com/my_app/page/privatePage/PrivatePageAction.java @@ -0,0 +1,26 @@ +package com.my_app.page.privatePage; + +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.utils.LoginUtils; + +public class PrivatePageAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest req, + HttpServletResponse response) throws Exception { + + if (LoginUtils.isUserLoggedIn(req.getSession())) { + return mapping.findForward("privatePage"); + } else { + return mapping.findForward("actionLoginRedir"); + } + } + +} diff --git a/src/main/java/com/my_app/page/publicPage/PublicPageAction.java b/src/main/java/com/my_app/page/publicPage/PublicPageAction.java new file mode 100644 index 0000000..b8ac88c --- /dev/null +++ b/src/main/java/com/my_app/page/publicPage/PublicPageAction.java @@ -0,0 +1,19 @@ +package com.my_app.page.publicPage; + +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; + +public class PublicPageAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + return mapping.findForward("publicPage"); + } + +} 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..5b5f0b8 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 @@ -8,6 +8,7 @@ public class UserSaveForm extends BaseActionForm { private Long userId; private String username; private String password; + private String email; private Long countryId; private Long cityId; @@ -79,4 +80,12 @@ public static long getSerialversionuid() { return serialVersionUID; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + } 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..a3e2c53 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 @@ -13,6 +13,7 @@ public UserSaveForm mapTo(User user, UserSaveForm form) { form.setUserId(user.getId()); form.setUsername(user.getUsername()); + form.setEmail(user.getEmail()); form.setCountryId(user.getCity().getCountry().getId()); form.setCityId(user.getCity().getId()); 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..2cca683 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(form.getEmail() == null) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.common.required")); + } else if(!UserUtils.validateEmail(form.getEmail())) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("user.email.error")); + } return isValid; } 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..f9d73f6 --- /dev/null +++ b/src/main/java/com/my_app/repo/CompanyRepository.java @@ -0,0 +1,9 @@ +package com.my_app.repo; + +import com.my_app.model.Company; + +public interface CompanyRepository extends Repository { + + Company findByName(String name); + +} 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..844a6c9 --- /dev/null +++ b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java @@ -0,0 +1,129 @@ +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.LinkedList; +import java.util.List; + +import com.my_app.exception.AppGenericException; +import com.my_app.model.Company; +import com.my_app.model.User; +import com.my_app.repo.CityRepository; +import com.my_app.repo.CompanyRepository; +import com.my_app.utils.CompanyUtils; + +public class CompanyRepositoryImpl implements CompanyRepository { + + 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 o) { + if (o.isNew()) { + return this.create(o); + } else { + return this.update(o); + } + } + + private Company create(Company company) { + try (final PreparedStatement stmt = this.conn + .prepareStatement("INSERT INTO \"COMPANY\" (NAME, ADDRESS, CITY_ID, VAT) VALUES (?, ?, ?, ?)")) { + + stmt.setString(1, company.getName()); + stmt.setString(2, company.getAddress()); + stmt.setLong(3, company.getCity().getId()); + stmt.setLong(4, company.getVat()); + + 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 \"COMPANY\" SET NAME = ?, ADDRESS = ?, CITY_ID = ?, VAT = ? WHERE ID = ?")) { + stmt.setString(1, company.getName()); + stmt.setString(2, company.getAddress()); + stmt.setLong(3, company.getCity().getId()); + stmt.setLong(4, company.getVat()); + 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 ID, NAME, ADDRESS, VAT, CITY_ID FROM \"COMPANY\" WHERE ID = ?")) { + 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.getLong(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 ID, NAME, ADDRESS, VAT, CITY_ID FROM \"COMPANY\""); + final ResultSet rs = stmt.executeQuery()) { + final List companies = new LinkedList<>(); + while (rs.next()) { + companies.add(new Company(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getLong(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 \"COMPANY\" WHERE ID = ?")) { + stmt.setLong(1, id); + stmt.executeUpdate(); + } catch (SQLException e) { + throw new AppGenericException("Error while deleting for Company", e); + } + + } + + @Override + public void delete(Company o) { + this.deleteById(o.getId()); + } + + @Override + public Company findByName(String name) { + try (final PreparedStatement stmt = this.conn.prepareStatement("SELECT ID, NAME, ADDRESS, VAT, CITY_ID FROM \"COMPANY\" WHERE 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.getLong(4),this.cityRepository.findById(rs.getLong(5))); + } + } + return null; + } catch (SQLException e) { + throw new AppGenericException("Error while querying by name for Company", e); + } + } +} \ No newline at end of file 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/service/CompanyService.java b/src/main/java/com/my_app/service/CompanyService.java new file mode 100644 index 0000000..51ba3af --- /dev/null +++ b/src/main/java/com/my_app/service/CompanyService.java @@ -0,0 +1,7 @@ +package com.my_app.service; + +import com.my_app.model.Company; + +public interface CompanyService extends BaseService { + +} 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..9207dee --- /dev/null +++ b/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java @@ -0,0 +1,19 @@ +package com.my_app.service.factory; + +import java.sql.Connection; + +import com.my_app.repo.impl.CityRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; +import com.my_app.repo.impl.CountryRepositoryImpl; +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)))); + } + +} 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..c0bcadf --- /dev/null +++ b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java @@ -0,0 +1,42 @@ +package com.my_app.service.impl; + +import java.util.List; + +import com.my_app.model.Company; +import com.my_app.repo.CompanyRepository; +import com.my_app.service.CompanyService; + +public class CompanyServiceImpl implements CompanyService { + + private final CompanyRepository companyRepository; + + public CompanyServiceImpl(CompanyRepository companyRepository) { + this.companyRepository = companyRepository; + } + + @Override + public Company save(Company o) { + return companyRepository.save(o); + } + + @Override + public Company findById(Long id) { + return companyRepository.findById(id); + } + + @Override + public List findAll() { + return companyRepository.findAll(); + } + + @Override + public void deleteById(Long id) { + companyRepository.deleteById(id); + } + + @Override + public void delete(Company o) { + companyRepository.delete(o); + } + +} diff --git a/src/main/java/com/my_app/utils/CompanyUtils.java b/src/main/java/com/my_app/utils/CompanyUtils.java new file mode 100644 index 0000000..4f610e1 --- /dev/null +++ b/src/main/java/com/my_app/utils/CompanyUtils.java @@ -0,0 +1,14 @@ +package com.my_app.utils; + +import static org.apache.commons.lang3.StringUtils.lowerCase; +import static org.apache.commons.lang3.StringUtils.replace; + +public class CompanyUtils { + + private CompanyUtils() {} + + public static String normalizeName(String name) { + return replace(lowerCase(name), " ", "_"); + } + +} diff --git a/src/main/java/com/my_app/utils/UserUtils.java b/src/main/java/com/my_app/utils/UserUtils.java index d163006..d688fc0 100644 --- a/src/main/java/com/my_app/utils/UserUtils.java +++ b/src/main/java/com/my_app/utils/UserUtils.java @@ -3,6 +3,9 @@ import static org.apache.commons.lang3.StringUtils.lowerCase; import static org.apache.commons.lang3.StringUtils.replace; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class UserUtils { private UserUtils() { @@ -11,5 +14,12 @@ private UserUtils() { public static String normalizeUsername(String username) { return replace(lowerCase(username), " ", "_"); } + + public static final Pattern VALID_EMAIL_REGEX = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", + Pattern.CASE_INSENSITIVE); + public static boolean validateEmail(String emailStr) { + Matcher matcher = VALID_EMAIL_REGEX.matcher(emailStr); + return matcher.matches(); + } } diff --git a/src/main/webapp/WEB-INF/struts-config.xml b/src/main/webapp/WEB-INF/struts-config.xml index 12cd624..4b3cdf1 100644 --- a/src/main/webapp/WEB-INF/struts-config.xml +++ b/src/main/webapp/WEB-INF/struts-config.xml @@ -6,19 +6,29 @@ + - + + + + + + + + + + @@ -30,6 +40,16 @@ + + + + + + + + + + diff --git a/src/main/webapp/company/list.jsp b/src/main/webapp/company/list.jsp new file mode 100644 index 0000000..5909298 --- /dev/null +++ b/src/main/webapp/company/list.jsp @@ -0,0 +1,82 @@ +<%@ 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"%> + + + + + + +Users - MyApp + + + + +
+

Companies

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameAddressVatCountryCityActions
List of companies is empty!
${company.name}${company.address}${company.vat}${company.city.country.name}${company.city.name} +
+ + + + + + +
+
+ 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..26bbe9f --- /dev/null +++ b/src/main/webapp/company/save/form.jsp @@ -0,0 +1,104 @@ +<%@ 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..67f9367 --- /dev/null +++ b/src/main/webapp/company/save/js/form.js @@ -0,0 +1,75 @@ +/** + * + */ + +let form = { + $form: $('form#company-save-fome'), + $action: $('input[name="action"]'), + + company: { + $id: $('input#company-id'), + $name: $('input#company-name'), + $address: $('input#company-address'), + $vat: $('input#company-vat'), + $country: $('select#company-country'), + $city: $('select#company-city') + }, + + 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('comapny 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..674c5ae 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 92be318..ee0f2f2 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -16,18 +16,22 @@
  • Default
  • With sidebar
  • Full-width fluid
    • + +
  • Public Page
    • +
  • Private Page
    •
  • diff --git a/src/main/webapp/privatePage.jsp b/src/main/webapp/privatePage.jsp new file mode 100644 index 0000000..9a57d9d --- /dev/null +++ b/src/main/webapp/privatePage.jsp @@ -0,0 +1,66 @@ +<%@ 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"%> + + + + + + + +My Public Page - MyApp + + + + + + +
    +

    Private Page

    +

    Welcome to My Private Page

    +
    +
    +
    + +
    #1 PYTHON
    +
    +

    + Landed at No.1 on the PYPL chart as the most popular programming language, Python accounts for 28.11% of the market share, making it the most used programming language in 2024, although it has been around for almost three decades. Python, developed by Guido van Rossum in 1989, is a general-purpose programming language that is widely used in web app development, data science, artificial intelligence (AI), scientific computing, machine learning, etc. +

    +
    + + +
      +
    • Where can I get some?
      • +
    • Why do we use it?
      • +
    • What is Lorem Ipsum?
      • +
    +
    +
    + +
    +
    + +
    #2 JAVA
    +
    +

    + Java, created by James Gosling in 1995, has long been one of the most popular programming languages in the world, and it holds the second position on the PYPL chart with a market share of 15.52%. Java is a general-purpose, platform-independent, and object-oriented programming language that enables developers to create robust and high-performance applications. +

    +
    + + +
      +
    • Where can I get some?
      • +
    • Why do we use it?
      • +
    • What is Lorem Ipsum?
      • + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/src/main/webapp/publicPage.jsp b/src/main/webapp/publicPage.jsp new file mode 100644 index 0000000..7c5e29b --- /dev/null +++ b/src/main/webapp/publicPage.jsp @@ -0,0 +1,38 @@ +<%@ 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"%> + + + + + + + +My Public Page - MyApp + + + + + + +
    +

    Page Public

    +

    Welcome to My Public Page

    +

    Top 20 Most Popular Programming Languages in 2024 & Beyond

    +
    +
    +
      +
    • Python
      • +
    • Java
      • +
    • JavaScript
      • +
    • C/C++
      • +
    • C#
      • +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/src/main/webapp/user/list.jsp b/src/main/webapp/user/list.jsp index 72bded5..0eb95b3 100644 --- a/src/main/webapp/user/list.jsp +++ b/src/main/webapp/user/list.jsp @@ -37,6 +37,7 @@ Id Username + Email Country City Actions @@ -54,6 +55,7 @@ ${user.id} ${user.username} + ${user.email} ${user.city.country.name} ${user.city.name} diff --git a/src/main/webapp/user/save/form.jsp b/src/main/webapp/user/save/form.jsp index 3a3f1b4..5a5175e 100644 --- a/src/main/webapp/user/save/form.jsp +++ b/src/main/webapp/user/save/form.jsp @@ -47,6 +47,14 @@
    • + +
    + + +
    + +
    +
    diff --git a/src/main/webapp/user/save/js/form.js b/src/main/webapp/user/save/js/form.js index 1585047..b955768 100644 --- a/src/main/webapp/user/save/js/form.js +++ b/src/main/webapp/user/save/js/form.js @@ -9,6 +9,7 @@ let form = { user: { $id: $('input#user-id'), $username: $('input#user-username'), + $email: $('input#user-email'), $password: $('input#user-password'), $country: $('select#user-country'), $city: $('select#user-city')