diff --git a/.gitignore b/.gitignore index d4174b465..a72b8eebf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,11 @@ npm-debug.log .idea rebel.xml /logs/ +/forms/nbactions.xml +/nb-configuration.xml +/forms/nb-configuration.xml +/persistence-mongodb/nb-configuration.xml +/forms/.rebel.xml.bak +/persistence/nb-configuration.xml +/web/nb-configuration.xml +/ui/nb-configuration.xml \ No newline at end of file diff --git a/forms/pom.xml b/forms/pom.xml index 57f3e7eb9..e1376f5ae 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -29,9 +29,9 @@ UTF-8 1.8 - 7.4.0 - 0.10.8 - 1.9 + 7.5.0 + 0.10.11 + 1.10 0.5.5 v20160822 @@ -231,7 +231,7 @@ org.apache.poi poi - ${poi.version} + ${pentaho.poi.version} diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.html b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.html new file mode 100644 index 000000000..7a2782cdd --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.html @@ -0,0 +1,15 @@ + + + + +EditUserDashboardPage + + + +
+
+
+
+ + + diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.java b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.java new file mode 100644 index 000000000..741b7c61d --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.java @@ -0,0 +1,81 @@ +/******************************************************************************* + * Copyright (c) 2016 Development Gateway, Inc and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License (MIT) + * which accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + * + * Contributors: + * Development Gateway - initial API and implementation + *******************************************************************************/ +package org.devgateway.ocds.forms.wicket.page.edit; + +import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.spring.injection.annot.SpringBean; +import org.devgateway.ocds.forms.wicket.page.list.ListAllDashboardsPage; +import org.devgateway.ocds.forms.wicket.providers.LabelPersistableJpaRepositoryTextChoiceProvider; +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.ocds.persistence.repository.UserDashboardRepository; +import org.devgateway.toolkit.forms.security.SecurityConstants; +import org.devgateway.toolkit.forms.wicket.components.form.Select2MultiChoiceBootstrapFormComponent; +import org.devgateway.toolkit.forms.wicket.components.form.TextAreaFieldBootstrapFormComponent; +import org.devgateway.toolkit.forms.wicket.components.form.TextFieldBootstrapFormComponent; +import org.devgateway.toolkit.forms.wicket.page.edit.AbstractEditPage; +import org.devgateway.toolkit.persistence.dao.Person; +import org.devgateway.toolkit.persistence.repository.PersonRepository; +import org.wicketstuff.annotation.mount.MountPath; + +@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_ADMIN) +@MountPath("/editUserDashboard") +public class EditUserDashboardPage extends AbstractEditPage { + + private static final long serialVersionUID = -6069250112046118104L; + + @Override + protected UserDashboard newInstance() { + return new UserDashboard(); + } + + @SpringBean + private UserDashboardRepository userDashboardRepository; + + @SpringBean + private PersonRepository personRepository; + + public EditUserDashboardPage(final PageParameters parameters) { + super(parameters); + this.jpaRepository = userDashboardRepository; + this.listPageClass = ListAllDashboardsPage.class; + + } + + @Override + protected void onInitialize() { + super.onInitialize(); + + TextFieldBootstrapFormComponent name = new TextFieldBootstrapFormComponent<>("name"); + name.required(); + editForm.add(name); + + TextAreaFieldBootstrapFormComponent formUrlEncodedBody = + new TextAreaFieldBootstrapFormComponent<>("formUrlEncodedBody"); + formUrlEncodedBody.required(); + formUrlEncodedBody.getField().setEnabled(false); + editForm.add(formUrlEncodedBody); + + Select2MultiChoiceBootstrapFormComponent defaultDashboardUsers = + new Select2MultiChoiceBootstrapFormComponent<>("defaultDashboardUsers", + new LabelPersistableJpaRepositoryTextChoiceProvider<>(personRepository)); + defaultDashboardUsers.setEnabled(false); + editForm.add(defaultDashboardUsers); + + Select2MultiChoiceBootstrapFormComponent users = + new Select2MultiChoiceBootstrapFormComponent<>("users", + new LabelPersistableJpaRepositoryTextChoiceProvider<>(personRepository)); + editForm.add(users); + + + } +} diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.properties b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.properties new file mode 100644 index 000000000..2522f3134 --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/edit/EditUserDashboardPage.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2015 Development Gateway, Inc and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the MIT License (MIT) +# which accompanies this distribution, and is available at +# https://opensource.org/licenses/MIT +# +# Contributors: +# Development Gateway - initial API and implementation +############################################################################### +page.title=Edit User Dashboard +name.label=Name +formUrlEncodedBody.label=Filter body +formUrlEncodedBody.help=This is a list of saved filters from the UI and cannot be edited here. +defaultDashboardUsers.label=Default Dashboard For Users +defaultDashboardUsers.help=This is a user setting and can be changed from the User form +users.label=Assigned Users +delete_error_message=Cannot delete this dashboard. It is assigned as the default dashboard for at least one user.\ + Please assign a different default dashboard for the assigned users or select no default dashboard, and then try the delete again. \ No newline at end of file diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage$DashboardsActionPanel.html b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage$DashboardsActionPanel.html new file mode 100644 index 000000000..3d00cc949 --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage$DashboardsActionPanel.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.java b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.java new file mode 100644 index 000000000..b6a2bffe3 --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.java @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2016 Development Gateway, Inc and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License (MIT) + * which accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + * + * Contributors: + * Development Gateway - initial API and implementation + *******************************************************************************/ +package org.devgateway.ocds.forms.wicket.page.list; + +import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapExternalLink; +import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; +import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconType; +import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; +import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.spring.injection.annot.SpringBean; +import org.devgateway.ocds.forms.wicket.page.edit.EditUserDashboardPage; +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.ocds.persistence.repository.UserDashboardRepository; +import org.devgateway.toolkit.forms.security.SecurityConstants; +import org.devgateway.toolkit.forms.wicket.page.lists.AbstractListPage; +import org.wicketstuff.annotation.mount.MountPath; + +@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_ADMIN) +@MountPath(value = "/listAllDashboards") +public class ListAllDashboardsPage extends AbstractListPage { + + /** + * + */ + private static final long serialVersionUID = -324298525712620234L; + @SpringBean + protected UserDashboardRepository userDashboardRepository; + + public class DashboardsActionPanel extends ActionPanel { + + /** + * @param id + * @param model + */ + public DashboardsActionPanel(String id, IModel model) { + super(id, model); + + UserDashboard entity = (UserDashboard) this.getDefaultModelObject(); + + BootstrapExternalLink viewLink = new BootstrapExternalLink("view", Model.of("ui/index.html?dashboardId=" + + entity.getId()), Buttons.Type.Danger) { + }; + viewLink.setLabel(new StringResourceModel("view", ListAllDashboardsPage.this, null)); + viewLink.setIconType(FontAwesomeIconType.eye).setSize(Buttons.Size.Small); + add(viewLink); + + } + } + + public ListAllDashboardsPage(final PageParameters pageParameters) { + super(pageParameters); + this.jpaRepository = userDashboardRepository; + this.editPageClass = EditUserDashboardPage.class; + columns.add(new PropertyColumn( + new Model((new StringResourceModel("name", ListAllDashboardsPage.this, null)).getString()), + "name", "name")); + columns.add(new PropertyColumn(new Model( + (new StringResourceModel("defaultDashboardUsers", ListAllDashboardsPage.this, null)).getString()), + "defaultDashboardUsers", "defaultDashboardUsers")); + + columns.add(new PropertyColumn(new Model( + (new StringResourceModel("users", ListAllDashboardsPage.this, null)).getString()), + "users", "users")); + + } + + @Override + protected void onInitialize() { + super.onInitialize(); + + editPageLink.setVisibilityAllowed(false); + } + + @Override + public ActionPanel getActionPanel(String id, IModel model) { + return new DashboardsActionPanel(id, model); + } +} diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.properties b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.properties new file mode 100644 index 000000000..c961f460c --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListAllDashboardsPage.properties @@ -0,0 +1,16 @@ +############################################################################### +# Copyright (c) 2015 Development Gateway, Inc and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the MIT License (MIT) +# which accompanies this distribution, and is available at +# https://opensource.org/licenses/MIT +# +# Contributors: +# Development Gateway - initial API and implementation +############################################################################### +page.title=All Dashboards +name=Name +defaultDashboardUsers=Default Dashboard For Users +users=Users +view=View \ No newline at end of file diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.java b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.java new file mode 100644 index 000000000..b7b7f36ea --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2016 Development Gateway, Inc and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License (MIT) + * which accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + * + * Contributors: + * Development Gateway - initial API and implementation + *******************************************************************************/ +package org.devgateway.ocds.forms.wicket.page.list; + +import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.spring.injection.annot.SpringBean; +import org.devgateway.ocds.forms.wicket.providers.PersonDashboardJpaRepositoryProvider; +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.toolkit.forms.security.SecurityConstants; +import org.devgateway.toolkit.forms.wicket.providers.SortableJpaRepositoryDataProvider; +import org.devgateway.toolkit.persistence.repository.PersonRepository; +import org.wicketstuff.annotation.mount.MountPath; + +@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_PROCURING_ENTITY) +@MountPath(value = "/listMyDashboards") +public class ListMyDashboardsPage extends ListAllDashboardsPage { + + /** + * + */ + private static final long serialVersionUID = 8105049572554654046L; + + @SpringBean + private PersonRepository personRepository; + + + @Override + public SortableJpaRepositoryDataProvider getProvider() { + return new PersonDashboardJpaRepositoryProvider(userDashboardRepository, personRepository); + } + + public ListMyDashboardsPage(final PageParameters pageParameters) { + super(pageParameters); + } + +} diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.properties b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.properties new file mode 100644 index 000000000..092626609 --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/page/list/ListMyDashboardsPage.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2015 Development Gateway, Inc and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the MIT License (MIT) +# which accompanies this distribution, and is available at +# https://opensource.org/licenses/MIT +# +# Contributors: +# Development Gateway - initial API and implementation +############################################################################### +page.title=My Dashboards \ No newline at end of file diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/LabelPersistableJpaRepositoryTextChoiceProvider.java b/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/LabelPersistableJpaRepositoryTextChoiceProvider.java new file mode 100644 index 000000000..2e83e860b --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/LabelPersistableJpaRepositoryTextChoiceProvider.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2015 Development Gateway, Inc and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License (MIT) + * which accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + * + * Contributors: + * Development Gateway - initial API and implementation + *******************************************************************************/ +/** + * + */ +package org.devgateway.ocds.forms.wicket.providers; + +import java.util.Collection; + +import org.apache.wicket.model.IModel; +import org.devgateway.toolkit.forms.wicket.providers.AbstractJpaRepositoryTextChoiceProvider; +import org.devgateway.toolkit.persistence.dao.GenericPersistable; +import org.devgateway.toolkit.persistence.dao.Labelable; +import org.devgateway.toolkit.persistence.repository.category.TextSearchableRepository; + +/** + * @author mpostelnicu + * + */ +public class LabelPersistableJpaRepositoryTextChoiceProvider + extends AbstractJpaRepositoryTextChoiceProvider { + + /** + * + */ + private static final long serialVersionUID = -9109118476966448737L; + + public LabelPersistableJpaRepositoryTextChoiceProvider( + final TextSearchableRepository textSearchableRepository) { + super(textSearchableRepository); + } + + public LabelPersistableJpaRepositoryTextChoiceProvider( + final TextSearchableRepository textSearchableRepository, + final IModel> restrictedToItemsModel) { + super(textSearchableRepository, restrictedToItemsModel); + } + + public LabelPersistableJpaRepositoryTextChoiceProvider( + final TextSearchableRepository textSearchableRepository, final Class clazz, + final Boolean addNewElements) { + super(textSearchableRepository, clazz, addNewElements); + } + + @Override + public String getDisplayValue(final T choice) { + return choice.getLabel(); + } +} diff --git a/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/PersonDashboardJpaRepositoryProvider.java b/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/PersonDashboardJpaRepositoryProvider.java new file mode 100644 index 000000000..86416e401 --- /dev/null +++ b/forms/src/main/java/org/devgateway/ocds/forms/wicket/providers/PersonDashboardJpaRepositoryProvider.java @@ -0,0 +1,54 @@ +/** + * + */ +package org.devgateway.ocds.forms.wicket.providers; + +import java.util.Iterator; + +import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.ocds.persistence.repository.UserDashboardRepository; +import org.devgateway.toolkit.forms.WebConstants; +import org.devgateway.toolkit.forms.security.SecurityUtil; +import org.devgateway.toolkit.forms.wicket.providers.SortableJpaRepositoryDataProvider; +import org.devgateway.toolkit.persistence.repository.PersonRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; + +/** + * @author mpost + * + */ +public class PersonDashboardJpaRepositoryProvider extends SortableJpaRepositoryDataProvider { + + private static final long serialVersionUID = -490237568464403107L; + + private UserDashboardRepository userDashboardRepository; + + private PersonRepository personRepository; + + public PersonDashboardJpaRepositoryProvider(UserDashboardRepository jpaRepository, + PersonRepository personRepository) { + super(jpaRepository); + this.personRepository = personRepository; + userDashboardRepository = (UserDashboardRepository) jpaRepository; + } + + /** + * @see SortableDataProvider#iterator(long, long) + */ + @Override + public Iterator iterator(final long first, final long count) { + int page = (int) ((double) first / WebConstants.PAGE_SIZE); + Page findAll = + userDashboardRepository.findDashboardsForPersonId(SecurityUtil.getCurrentAuthenticatedPerson().getId(), + new PageRequest(page, WebConstants.PAGE_SIZE, translateSort())); + return findAll.iterator(); + } + + @Override + public long size() { + return personRepository.getOne(SecurityUtil.getCurrentAuthenticatedPerson().getId()).getDashboards().size(); + } + +} diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/security/SecurityConstants.java b/forms/src/main/java/org/devgateway/toolkit/forms/security/SecurityConstants.java index 4196152a2..9a6f99a76 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/security/SecurityConstants.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/security/SecurityConstants.java @@ -28,5 +28,6 @@ private Roles() { public static final String ROLE_ADMIN = "ROLE_ADMIN"; public static final String ROLE_USER = "ROLE_USER"; + public static final String ROLE_PROCURING_ENTITY = "ROLE_PROCURING_ENTITY"; } } diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/util/MarkupCacheService.java b/forms/src/main/java/org/devgateway/toolkit/forms/util/MarkupCacheService.java index 45695b565..5bcc5129f 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/util/MarkupCacheService.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/util/MarkupCacheService.java @@ -62,14 +62,14 @@ public final void flushMarkupCache() { /** * Add the content of a report (PDF, Excel, RTF) to cache - * + * * @param outputType * @param reportName * @param parameters * @param buffer */ public void addReportToCache(final String outputType, final String reportName, final String parameters, - final byte[] buffer) { + final byte[] buffer) { CacheManager cm = CacheManager.getInstance(); // get the reports cache "reportsCache", declared in ehcache.xml @@ -80,7 +80,7 @@ public void addReportToCache(final String outputType, final String reportName, f /** * Fetch the content of a report from cache - * + * * @param outputType * @param reportName * @param parameters @@ -139,7 +139,20 @@ public void clearReportsCache() { if (cache != null) { cache.removeAll(); } + } + + /** + * Remove from cache all reports api content + */ + public void clearReportsApiCache() { + CacheManager cm = CacheManager.getInstance(); + // get the reports cache "reportsApiCache", declared in ehcache.xml + Cache cache = cm.getCache("reportsApiCache"); + + if (cache != null) { + cache.removeAll(); + } } private String createCacheKey(final String outputType, final String reportName, final String parameters) { diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.html new file mode 100644 index 000000000..52c3ed42a --- /dev/null +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.html @@ -0,0 +1,30 @@ + + + ListSectionPanel + + + +
+
+

[[title]]

+
+ +
+ + + + + + +
+ +
+
+
+ +
+ +
+ + + diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.java new file mode 100644 index 000000000..9a7e5640a --- /dev/null +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ListViewSectionPanel.java @@ -0,0 +1,142 @@ +package org.devgateway.toolkit.forms.wicket.components; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.markup.html.TransparentWebMarkupContainer; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.model.CompoundPropertyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.ResourceModel; +import org.devgateway.toolkit.forms.wicket.components.form.BootstrapAddButton; +import org.devgateway.toolkit.forms.wicket.components.form.BootstrapDeleteButton; +import org.devgateway.toolkit.persistence.dao.AbstractAuditableEntity; + +import java.util.List; + +/** + * @author idobre + * @since 10/5/16 + * + * Class that displays a list of type with the possibility of adding/removing elements. + * + * @param The current list data type + * @param The parent field data type + */ + +public abstract class ListViewSectionPanel + extends CompoundSectionPanel> { + private WebMarkupContainer listWrapper; + + protected ListView listView; + + public ListViewSectionPanel(final String id) { + super(id); + } + + /** + * Removes a child based on its index + * + * @param index + * @return + */ + private BootstrapDeleteButton getRemoveChildButton(final int index) { + BootstrapDeleteButton removeButton = new BootstrapDeleteButton("remove") { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(final AjaxRequestTarget target, final Form form) { + ListViewSectionPanel.this.getModelObject().remove(index); + listView.removeAll(); + target.add(listWrapper); + } + }; + + removeButton.setOutputMarkupPlaceholderTag(true); + return removeButton; + } + + /** + * Returns the new child button + * + * @return + */ + protected BootstrapAddButton getAddNewChildButton() { + BootstrapAddButton newButton = new BootstrapAddButton("newButton", new ResourceModel("newButton")) { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(final AjaxRequestTarget target, final Form form) { + @SuppressWarnings("unchecked") + T newChild = createNewChild((IModel) ListViewSectionPanel.this.getParent().getDefaultModel()); + ListViewSectionPanel.this.getModel().getObject().add(newChild); + + listView.removeAll(); + target.add(listWrapper); + } + + }; + + newButton.setOutputMarkupPlaceholderTag(true); + return newButton; + } + + @Override + protected void onInitialize() { + super.onInitialize(); + + setOutputMarkupId(true); + setOutputMarkupPlaceholderTag(true); + + listWrapper = new TransparentWebMarkupContainer("listWrapper"); + listWrapper.setOutputMarkupId(true); + add(listWrapper); + + listWrapper.add(new Label("panelTitle", title)); + + listView = new ListView("list", getModel()) { + private static final long serialVersionUID = 1L; + + @Override + protected void populateItem(final ListItem item) { + // we wrap the item model on a compound model so we can use the field ids as property models + final CompoundPropertyModel compoundPropertyModel = new CompoundPropertyModel<>(item.getModel()); + + // we set back the model as the compound model, thus ensures the rest of the items added will benefit + item.setModel(compoundPropertyModel); + + // we add the rest of the items in the listItem + populateCompoundListItem(item); + + // we add the remove button + final BootstrapDeleteButton removeButton = getRemoveChildButton(item.getIndex()); + item.add(removeButton); + } + }; + + listView.setReuseItems(true); + listView.setOutputMarkupId(true); + listWrapper.add(listView); + + final BootstrapAddButton addButton = getAddNewChildButton(); + add(addButton); + } + + /** + * Use the constructor for new children and return the entity after setting + * its parent + * + * @param parentModel the model of the parent + * @return + */ + public abstract T createNewChild(IModel parentModel); + + /** + * Populates the list item elements + * + * @param item + */ + public abstract void populateCompoundListItem(ListItem item); +} diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/form/GenericBootstrapFormComponent.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/form/GenericBootstrapFormComponent.java index 693690f12..e05a7088e 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/form/GenericBootstrapFormComponent.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/form/GenericBootstrapFormComponent.java @@ -159,6 +159,8 @@ public GenericBootstrapFormComponent(final String id, final IModel label field.add(sizeBehavior); border.add(field); + field.setLabel(labelModel); + tooltipLabel = new TooltipLabel("tooltipLabel", id); border.add(tooltipLabel); } diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.java index c508c9443..d3e6fbb3d 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.java @@ -47,6 +47,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.resource.JQueryResourceReference; import org.apache.wicket.util.string.StringValue; +import org.devgateway.ocds.forms.wicket.page.list.ListAllDashboardsPage; +import org.devgateway.ocds.forms.wicket.page.list.ListMyDashboardsPage; import org.devgateway.toolkit.forms.WebConstants; import org.devgateway.toolkit.forms.security.SecurityConstants; import org.devgateway.toolkit.forms.security.SecurityUtil; @@ -251,6 +253,17 @@ protected NavbarButton newHomeMenu() { return homeMenu; } + + protected NavbarButton newMyDashboardsMenu() { + // home + NavbarButton menu = new NavbarButton<>(ListMyDashboardsPage.class, + this.getPageParameters(), new ResourceModel("mydashboards")); + menu.setIconType(GlyphIconType.filter); + MetaDataRoleAuthorizationStrategy.authorize(menu, Component.RENDER, + SecurityConstants.Roles.ROLE_PROCURING_ENTITY); + return menu; + } + protected NavbarDropDownButton newAdminMenu() { // admin menu @@ -311,6 +324,10 @@ protected void onComponentTag(final ComponentTag tag) { list.add(new MenuBookmarkablePageLink(EditAdminSettingsPage.class, new StringResourceModel("navbar.adminSettings", BasePage.this, null)) .setIconType(FontAwesomeIconType.briefcase)); + + list.add(new MenuBookmarkablePageLink(ListAllDashboardsPage.class, + new StringResourceModel("navbar.allDashboard", BasePage.this, null)) + .setIconType(FontAwesomeIconType.filter)); list.add(uiBrowserLink); @@ -342,7 +359,9 @@ protected Navbar newNavbar(final String markupId) { navbar.setPosition(Navbar.Position.TOP); navbar.setInverted(true); - navbar.addComponents(NavbarComponents.transform(Navbar.ComponentPosition.RIGHT, newHomeMenu(), newAdminMenu(), + navbar.addComponents(NavbarComponents.transform(Navbar.ComponentPosition.RIGHT, newHomeMenu(), + newMyDashboardsMenu(), + newAdminMenu(), newAccountMenu(), newLogoutMenu())); navbar.addComponents(NavbarComponents.transform(Navbar.ComponentPosition.LEFT, newLanguageMenu())); diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.properties b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.properties index b5caa1823..affdef1c6 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.properties +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.properties @@ -22,3 +22,5 @@ navbar.adminSettings=Settings home=Home navbar.lang=Language navbar.jminix=JMX Console +navbar.allDashboard=All Saved Dashboards +mydashboards=My Dashboards \ No newline at end of file diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/EditTestFormPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/EditTestFormPage.java index be32b0bd3..ea817b21d 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/EditTestFormPage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/EditTestFormPage.java @@ -31,8 +31,8 @@ import org.devgateway.toolkit.forms.wicket.components.form.TextFieldBootstrapFormComponent; import org.devgateway.toolkit.forms.wicket.page.edit.AbstractEditPage; import org.devgateway.toolkit.forms.wicket.page.lists.ListTestFormPage; +import org.devgateway.toolkit.forms.wicket.providers.GenericChoiceProvider; import org.devgateway.toolkit.forms.wicket.providers.GenericPersistableJpaRepositoryTextChoiceProvider; -import org.devgateway.toolkit.forms.wicket.providers.ListChoiceProvider; import org.devgateway.toolkit.persistence.dao.TestForm; import org.devgateway.toolkit.persistence.dao.categories.Group; import org.devgateway.toolkit.persistence.dao.categories.Role; @@ -130,7 +130,7 @@ protected void onInitialize() { editForm.add(fileInput); Select2ChoiceBootstrapFormComponent preloadedEntitySelect = new Select2ChoiceBootstrapFormComponent<>( - "preloadedEntitySelect", new ListChoiceProvider<>(groupRepository.findAll())); + "preloadedEntitySelect", new GenericChoiceProvider<>(groupRepository.findAll())); preloadedEntitySelect.required(); editForm.add(preloadedEntitySelect); } diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.html index 1f2e1d6e0..1516f54d7 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.html +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.html @@ -15,7 +15,7 @@ -
+
Manage Users diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.java index a9a960db9..f1fc74b71 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/Homepage.java @@ -14,7 +14,10 @@ */ package org.devgateway.toolkit.forms.wicket.page; +import org.apache.wicket.Component; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.markup.html.TransparentWebMarkupContainer; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.devgateway.toolkit.forms.security.SecurityConstants; @@ -31,6 +34,18 @@ public class Homepage extends BasePage { */ public Homepage(final PageParameters parameters) { super(parameters); + + + } + + @Override + protected void onInitialize() { + super.onInitialize(); + TransparentWebMarkupContainer manageUsersPanel = new TransparentWebMarkupContainer("manageUsers"); + MetaDataRoleAuthorizationStrategy.authorize(manageUsersPanel, Component.RENDER, + SecurityConstants.Roles.ROLE_ADMIN); + add(manageUsersPanel); + } } diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java index ad399a07f..b3f024e46 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java @@ -125,6 +125,7 @@ public void flushReportingCaches() { if (markupCacheService != null) { markupCacheService.flushMarkupCache(); markupCacheService.clearReportsCache(); + markupCacheService.clearReportsApiCache(); } } diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage$ActionPanel.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage$ActionPanel.html index f16c6cc9a..ca83fbff8 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage$ActionPanel.html +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage$ActionPanel.html @@ -7,6 +7,7 @@ + diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage.java index e01f6cc85..88fcadce8 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/AbstractListPage.java @@ -123,6 +123,10 @@ public ActionPanel getActionPanel(final String id, final IModel model) { return new ActionPanel(id, model); } + public SortableJpaRepositoryDataProvider getProvider() { + return new SortableJpaRepositoryDataProvider<>(jpaRepository); + } + @Override protected void onInitialize() { super.onInitialize(); @@ -134,9 +138,9 @@ protected void onInitialize() { throw new NullEditPageClassException(); } - SortableJpaRepositoryDataProvider dataProvider = new SortableJpaRepositoryDataProvider<>(jpaRepository); + SortableJpaRepositoryDataProvider dataProvider = getProvider(); dataProvider.setFilterState(newFilterState()); - + // add the 'Edit' button columns.add(new AbstractColumn(new StringResourceModel("actionsColumn", this, null)) { private static final long serialVersionUID = -7447601118569862123L; diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.html index 07ae034a3..84f91c7e4 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.html +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.html @@ -8,6 +8,7 @@
+
diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java index eba30fa91..4a03632fd 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.devgateway.toolkit.forms.wicket.page.user; +import java.util.List; + import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; @@ -27,6 +29,9 @@ import org.apache.wicket.validation.ValidationError; import org.apache.wicket.validation.validator.EmailAddressValidator; import org.apache.wicket.validation.validator.PatternValidator; +import org.devgateway.ocds.forms.wicket.providers.LabelPersistableJpaRepositoryTextChoiceProvider; +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.ocds.persistence.repository.UserDashboardRepository; import org.devgateway.toolkit.forms.WebConstants; import org.devgateway.toolkit.forms.security.SecurityConstants; import org.devgateway.toolkit.forms.security.SecurityUtil; @@ -49,8 +54,6 @@ import org.springframework.security.crypto.password.StandardPasswordEncoder; import org.wicketstuff.annotation.mount.MountPath; -import java.util.List; - @AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER) @MountPath(value = "/account") public class EditUserPage extends AbstractEditPage { @@ -65,6 +68,10 @@ public class EditUserPage extends AbstractEditPage { @SpringBean private RoleRepository roleRepository; + @SpringBean + private UserDashboardRepository userDashboardRepository; + + @SpringBean private SendEmailService sendEmailService; @@ -79,8 +86,12 @@ public class EditUserPage extends AbstractEditPage { protected TextFieldBootstrapFormComponent title = new TextFieldBootstrapFormComponent<>("title"); protected Select2ChoiceBootstrapFormComponent group = new Select2ChoiceBootstrapFormComponent<>("group", - new GenericPersistableJpaRepositoryTextChoiceProvider<>(groupRepository)); + new LabelPersistableJpaRepositoryTextChoiceProvider<>(groupRepository)); + protected Select2ChoiceBootstrapFormComponent defaultDashboard = + new Select2ChoiceBootstrapFormComponent<>("defaultDashboard", + new GenericPersistableJpaRepositoryTextChoiceProvider<>(userDashboardRepository)); + protected Select2MultiChoiceBootstrapFormComponent roles = new Select2MultiChoiceBootstrapFormComponent<>( "roles", new Model<>("Roles"), new GenericPersistableJpaRepositoryTextChoiceProvider<>(roleRepository)); @@ -245,6 +256,10 @@ protected void onInitialize() { editForm.add(group); MetaDataRoleAuthorizationStrategy.authorize(group, Component.RENDER, SecurityConstants.Roles.ROLE_ADMIN); + editForm.add(defaultDashboard); + MetaDataRoleAuthorizationStrategy.authorize(defaultDashboard, Component.ENABLE, + SecurityConstants.Roles.ROLE_ADMIN); + roles.required(); roles.getField().setOutputMarkupId(true); roles.setIsFloatedInput(true); @@ -295,6 +310,13 @@ protected boolean isChangePassPage() { return false; } + private void ensureDefaultDashboardIsAlsoAssignedDashboard(Person person) { + if (person.getDefaultDashboard() != null && !person.getDashboards().contains(person.getDefaultDashboard())) { + person.getDefaultDashboard().getUsers().add(person); + person.getDashboards().add(person.getDefaultDashboard()); + } + } + @Override public SaveEditPageButton getSaveEditPageButton() { return new SaveEditPageButton("save", new StringResourceModel("save", EditUserPage.this, null)) { @@ -322,6 +344,9 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { saveable.setChangePassword(false); } + + ensureDefaultDashboardIsAlsoAssignedDashboard(saveable); + jpaRepository.save(saveable); if (!SecurityUtil.isCurrentUserAdmin()) { setResponsePage(Homepage.class); diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.properties b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.properties index da6b9dc13..1f1484fc5 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.properties +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.properties @@ -29,4 +29,6 @@ changePassword.label=User change password at sign in changePassAlert=*Please change your password nullPassword=Password is null. Please set a password save=Save -CountryValidator=The user is assigned to a group of type UNCT. Country is required! \ No newline at end of file +CountryValidator=The user is assigned to a group of type UNCT. Country is required! +defaultDashboard.label=Default Dashboard +defaultDashboard.help=This is the default UI dashboard that will be opened for this user after login \ No newline at end of file diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/LoginPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/LoginPage.java index e5b8c9ba4..e48a82786 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/LoginPage.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/LoginPage.java @@ -14,16 +14,17 @@ */ package org.devgateway.toolkit.forms.wicket.page.user; -import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; -import de.agilecoders.wicket.core.markup.html.bootstrap.form.BootstrapForm; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.flow.RedirectToUrlException; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; +import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.time.Duration; import org.devgateway.toolkit.forms.WebConstants; import org.devgateway.toolkit.forms.security.SecurityUtil; @@ -36,6 +37,9 @@ import org.devgateway.toolkit.persistence.repository.PersonRepository; import org.wicketstuff.annotation.mount.MountPath; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import de.agilecoders.wicket.core.markup.html.bootstrap.form.BootstrapForm; + /** * @author mpostelnicu * @@ -46,7 +50,7 @@ public class LoginPage extends BasePage { @SpringBean private PersonRepository personRepository; - + private static final int HIDE_NOTIFICATION_SECONDS = 15; class LoginForm extends BootstrapForm { @@ -55,18 +59,30 @@ class LoginForm extends BootstrapForm { private String username; private String password; + + private String referrer; LoginForm(final String id) { super(id); pageTitle.setVisible(false); } + + protected void retrieveReferrerFromSavedRequestIfPresent() { + StringValue referrerParam = RequestCycle.get().getRequest().getRequestParameters() + .getParameterValue("referrer"); + if (!referrerParam.isEmpty()) { + referrer = referrerParam.toString(); + } + } @Override protected void onInitialize() { super.onInitialize(); - final NotificationPanel notificationPanel = new NotificationPanel("loginFeedback"); + retrieveReferrerFromSavedRequestIfPresent(); + + NotificationPanel notificationPanel = new NotificationPanel("loginFeedback"); notificationPanel.hideAfter(Duration.seconds(HIDE_NOTIFICATION_SECONDS)); notificationPanel.setOutputMarkupId(true); add(notificationPanel); @@ -79,7 +95,7 @@ protected void onInitialize() { final PasswordFieldBootstrapFormComponent password = new PasswordFieldBootstrapFormComponent("password", new PropertyModel<>(this, "password")); password.getField().setResetPassword(false); - add(password); + add(password); final IndicatingAjaxButton submit = new IndicatingAjaxButton("submit", new StringResourceModel("submit.label", LoginPage.this, null)) { @@ -95,7 +111,10 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { PageParameters pageParam = new PageParameters(); pageParam.add(WebConstants.PARAM_ID, user.getId()); setResponsePage(ChangePasswordPage.class, pageParam); - } else { + } else { + if (referrer != null) { + throw new RedirectToUrlException(referrer); + } setResponsePage(getApplication().getHomePage()); } } else if (session.getAe().getMessage().equalsIgnoreCase("User is disabled")) { diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/GenericChoiceProvider.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/GenericChoiceProvider.java index 97a4d381a..86ab47719 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/GenericChoiceProvider.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/GenericChoiceProvider.java @@ -11,23 +11,24 @@ *******************************************************************************/ package org.devgateway.toolkit.forms.wicket.providers; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.wicketstuff.select2.ChoiceProvider; +import org.wicketstuff.select2.Response; + import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; -import org.wicketstuff.select2.ChoiceProvider; -import org.wicketstuff.select2.Response; - /** * @author idobre * @since 1/27/15 * - * This is a ChoiceProvider for "non-persistable" list of elements + * This is a ChoiceProvider for "non-persistable" unique list of elements */ -public abstract class GenericChoiceProvider extends ChoiceProvider { +public class GenericChoiceProvider extends ChoiceProvider { private static final long serialVersionUID = 1L; private static final Logger LOGGER = Logger.getLogger(GenericChoiceProvider.class); @@ -49,15 +50,24 @@ public GenericChoiceProvider(final List listOfElements) { } } + @Override + public String getDisplayValue(final T object) { + return object.toString(); + } + + @Override + public String getIdValue(final T object) { + return object.toString(); + } + @Override public void query(final String term, final int page, final Response response) { final List ret = new ArrayList<>(); if (bagOfElements != null && bagOfElements.values() != null && bagOfElements.values().size() > 0) { for (final T el : bagOfElements.values()) { - // the elements should implement the method toString in order to - // filter them - if (term == null || el.toString().toLowerCase().contains(term.toLowerCase())) { + // the elements should implement the method toString in order to filter them + if (StringUtils.isBlank(term) || el.toString().toLowerCase().contains(term.toLowerCase())) { ret.add(el); } } @@ -66,12 +76,6 @@ public void query(final String term, final int page, final Response response) response.addAll(ret); } - // @Override - // protected void toJson(T choice, org.apache.wicket.ajax.json.JSONWriter - // writer) { - // writer.key("id").value(choice.toString()).key("text").value(choice.toString()); - // } - @Override public Collection toChoices(final Collection ids) { final List ret = new ArrayList<>(); diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/ListChoiceProvider.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/ListChoiceProvider.java deleted file mode 100644 index d829dd6a0..000000000 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/providers/ListChoiceProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.devgateway.toolkit.forms.wicket.providers; - -import org.apache.commons.lang3.StringUtils; -import org.wicketstuff.select2.ChoiceProvider; -import org.wicketstuff.select2.Response; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * A simple choice provider that uses toString() for names. The list must not - * change since its indexes are used as values. - * - * Created by octavian on 8/11/16. - */ -public class ListChoiceProvider extends ChoiceProvider { - - private final List values; - - public ListChoiceProvider(final List values) { - this.values = values; - } - - @Override - public String getDisplayValue(final T object) { - return object.toString(); - } - - @Override - public String getIdValue(final T object) { - return Integer.toString(values.indexOf(object)); - } - - @Override - public void query(final String term, final int page, final Response response) { - String termLower = StringUtils.lowerCase(term); - for (T value : values) { - if (StringUtils.isBlank(termLower) || value.toString().toLowerCase().contains(termLower)) { - response.add(value); - } - } - } - - @Override - public Collection toChoices(final Collection ids) { - List selectedChoices = new ArrayList<>(ids.size()); - for (String id : ids) { - selectedChoices.add(values.get(Integer.parseInt(id))); - } - return selectedChoices; - } -} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/FlaggedRelease.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/FlaggedRelease.java new file mode 100644 index 000000000..3ffb2236a --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/FlaggedRelease.java @@ -0,0 +1,33 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo; + +import com.fasterxml.jackson.annotation.JsonView; +import org.devgateway.ocds.persistence.mongo.flags.Flaggable; +import org.devgateway.ocds.persistence.mongo.flags.ReleaseFlags; +import org.devgateway.ocds.persistence.mongo.spring.json.Views; +import org.springframework.data.mongodb.core.mapping.Document; + +/** + * @author mpostelnicu + * + */ +@Document(collection = "release") +public class FlaggedRelease extends Release implements Flaggable { + + @JsonView(Views.Internal.class) + private ReleaseFlags flags; + + @Override + public ReleaseFlags getFlags() { + return flags; + } + + public void setFlags(ReleaseFlags flags) { + this.flags = flags; + } + + + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/Tender.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/Tender.java index b7c45b6f1..654fded9e 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/Tender.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/Tender.java @@ -176,7 +176,7 @@ public class Tender implements Identifiable { @ExcelExport @JsonProperty("submissionMethod") @Merge(MergeStrategy.ocdsVersion) - private Set submissionMethod = new TreeSet(); + private Set submissionMethod = new TreeSet(); /** * Any detailed or further information on the submission method. This may include the address, @@ -560,7 +560,7 @@ public void setAwardCriteriaDetails(final String awardCriteriaDetails) { * The submissionMethod */ @JsonProperty("submissionMethod") - public Set getSubmissionMethod() { + public Set getSubmissionMethod() { return submissionMethod; } @@ -574,7 +574,7 @@ public Set getSubmissionMethod() { * The submissionMethod */ @JsonProperty("submissionMethod") - public void setSubmissionMethod(final Set submissionMethod) { + public void setSubmissionMethod(final Set submissionMethod) { this.submissionMethod = submissionMethod; } diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlagProcessor.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlagProcessor.java new file mode 100644 index 000000000..52b362be1 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlagProcessor.java @@ -0,0 +1,72 @@ +package org.devgateway.ocds.persistence.mongo.flags; + +import java.util.Collection; +import java.util.Set; +import java.util.stream.Collectors; + +import org.devgateway.ocds.persistence.mongo.flags.preconditions.NamedPredicate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractFlagProcessor { + + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + + /** + * Calculates the given flag and returns the flag value. Does not set any + * flag to the given {@link Flaggable} + * + * @param release + * a {@link Flaggable} + * @return the value of the flag. This can be null (not applicable), false , + * or true + */ + protected abstract Boolean calculateFlag(T flaggable, StringBuffer rationale); + + /** + * Decides if the current {@link Flaggable} is eligible for this flag + * + * @param flaggable + * @return true if is eligible, false otherwise + */ + protected abstract Collection> getPreconditionsPredicates(); + + /** + * Processes the flag on the flaggable. only if the current + * {@link Flaggable} {@link #checkPreconditions(Flaggable)}. invokes + * {@link #calculateFlag(Flaggable)} then {@link #setFlag(Flag, Flaggable)} + * with the {@link #generateRationale(Boolean, Flaggable)} + * + * @param flaggable + */ + public final void process(T flaggable) { + Boolean flagValue = null; + StringBuffer rationale = new StringBuffer(); + Set> failedPreconditionsPredicates = getPreconditionsPredicates().parallelStream() + .filter(predicate -> !predicate.test(flaggable)).collect(Collectors.toSet()); + + if (failedPreconditionsPredicates.isEmpty()) { + logger.debug("Flaggable " + flaggable.getIdProperty() + " does meet all preconditions. Calculating flag."); + flagValue = calculateFlag(flaggable, rationale); + } else { + logger.debug("Flaggable " + flaggable.getIdProperty() + + " does NOT meet all preconditions. Dumping failed predicates."); + rationale.append("Preconditions that are not met: "); + failedPreconditionsPredicates.forEach(p -> rationale.append(p.toString()).append("; ")); + } + + logger.debug("Setting flag with value " + flagValue + " to flaggable " + flaggable.getIdProperty()); + setFlag(new Flag(flagValue, rationale.toString()), flaggable); + } + + /** + * Sets the flag to the {@link Flaggable} + * + * @param flag + * the new flag + * @param flaggable + * the flaggable to set the flag to + */ + protected abstract void setFlag(Flag flag, T flaggable); + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlaggedReleaseFlagProcessor.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlaggedReleaseFlagProcessor.java new file mode 100644 index 000000000..146cbe5c4 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/AbstractFlaggedReleaseFlagProcessor.java @@ -0,0 +1,14 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.flags; + +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; + +/** + * @author mpostelnicu + * + */ +public abstract class AbstractFlaggedReleaseFlagProcessor extends AbstractFlagProcessor { + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flag.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flag.java new file mode 100644 index 000000000..c0f7ad56b --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flag.java @@ -0,0 +1,30 @@ +package org.devgateway.ocds.persistence.mongo.flags; + +public class Flag { + + private Boolean value; + + private String rationale; + + public Flag(Boolean value, String rationale) { + this.value = value; + this.rationale = rationale; + } + + public Boolean getValue() { + return value; + } + + public void setValue(Boolean value) { + this.value = value; + } + + public String getRationale() { + return rationale; + } + + public void setRationale(String rationale) { + this.rationale = rationale; + } + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flaggable.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flaggable.java new file mode 100644 index 000000000..6ea0513c8 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/Flaggable.java @@ -0,0 +1,14 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.flags; + +import org.devgateway.ocds.persistence.mongo.Identifiable; + +/** + * @author mpostelnicu An entity that can be flagged + */ +public interface Flaggable extends Identifiable { + + FlagsWrappable getFlags(); +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsConstants.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsConstants.java new file mode 100644 index 000000000..4e24c1564 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsConstants.java @@ -0,0 +1,10 @@ +package org.devgateway.ocds.persistence.mongo.flags; + +public final class FlagsConstants { + + private FlagsConstants() { + + } + + public static final String I038_VALUE = "flags.i038.value"; +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsWrappable.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsWrappable.java new file mode 100644 index 000000000..7cb95a424 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsWrappable.java @@ -0,0 +1,12 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.flags; + +/** + * @author mpostelnicu + * Interface designating the wrapper entity holding the flags + */ +public interface FlagsWrappable { + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/ReleaseFlags.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/ReleaseFlags.java new file mode 100644 index 000000000..68a0f5d09 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/ReleaseFlags.java @@ -0,0 +1,22 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.flags; + +/** + * @author mpostelnicu Represents the list of red flags at the Release level + */ +public class ReleaseFlags implements FlagsWrappable { + + // i038: Competitive tender w/ short bidding period + private Flag i038; + + public Flag getI038() { + return i038; + } + + public void setI038(Flag i038) { + this.i038 = i038; + } + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/FlaggedReleasePredicates.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/FlaggedReleasePredicates.java new file mode 100644 index 000000000..ea840eed3 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/FlaggedReleasePredicates.java @@ -0,0 +1,38 @@ +package org.devgateway.ocds.persistence.mongo.flags.preconditions; + +import org.devgateway.ocds.persistence.mongo.Award; +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.Tender.ProcurementMethod; + +/** + * + * @author mpostelnicu + * + */ +public final class FlaggedReleasePredicates { + + private FlaggedReleasePredicates() { + + } + + public static final NamedPredicate TENDER_START_DATE = new NamedPredicate<>( + "Needs to have tender start date", p -> p.getTender() != null && p.getTender().getTenderPeriod() != null + && p.getTender().getTenderPeriod().getStartDate() != null); + + public static final NamedPredicate TENDER_END_DATE = + new NamedPredicate<>("Needs to have tender end date", p -> p.getTender() != null + && p.getTender().getTenderPeriod() != null && p.getTender().getTenderPeriod().getEndDate() != null); + + public static final NamedPredicate OPEN_PROCUREMENT_METHOD = + new NamedPredicate<>("Needs to have open tender procurement method", + p -> p.getTender() != null && ProcurementMethod.open.equals(p.getTender().getProcurementMethod())); + + public static final NamedPredicate ACTIVE_AWARD = + new NamedPredicate<>("Needs to have at least one active award", + p -> p.getAwards().stream().filter(a -> Award.Status.active.equals(a.getStatus())).count() > 0); + + public static final NamedPredicate UNSUCCESSFUL_AWARD = new NamedPredicate<>( + "Needs to have at least one unsuccessful award", + p -> p.getAwards().stream().filter(a -> Award.Status.unsuccessful.equals(a.getStatus())).count() > 0); + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/NamedPredicate.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/NamedPredicate.java new file mode 100644 index 000000000..5bd802d3b --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/preconditions/NamedPredicate.java @@ -0,0 +1,30 @@ +package org.devgateway.ocds.persistence.mongo.flags.preconditions; + +import java.util.function.Predicate; + +/** + * A {@link Predicate}that also has a descriptive name + * + * @author mpostelnicu + * + * @param + */ +public class NamedPredicate implements Predicate { + private final String name; + private final Predicate predicate; + + public NamedPredicate(String name, Predicate predicate) { + this.name = name; + this.predicate = predicate; + } + + @Override + public boolean test(T t) { + return predicate.test(t); + } + + @Override + public String toString() { + return name; + } +} \ No newline at end of file diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/processors/release/ReleaseFlagI038Processor.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/processors/release/ReleaseFlagI038Processor.java new file mode 100644 index 000000000..9588bfd0d --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/processors/release/ReleaseFlagI038Processor.java @@ -0,0 +1,53 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.flags.processors.release; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.flags.AbstractFlaggedReleaseFlagProcessor; +import org.devgateway.ocds.persistence.mongo.flags.Flag; +import org.devgateway.ocds.persistence.mongo.flags.ReleaseFlags; +import org.devgateway.ocds.persistence.mongo.flags.preconditions.FlaggedReleasePredicates; +import org.devgateway.ocds.persistence.mongo.flags.preconditions.NamedPredicate; +import org.joda.time.DateTime; +import org.joda.time.Days; + +/** + * @author mpostelnicu + * + */ +public class ReleaseFlagI038Processor extends AbstractFlaggedReleaseFlagProcessor { + + public static final int MIN_ALLOWED_DAYS_BIDDING_PERIOD = 7; + + public static final ReleaseFlagI038Processor INSTANCE = new ReleaseFlagI038Processor(); + + @Override + protected void setFlag(Flag flag, FlaggedRelease flaggable) { + if (flaggable.getFlags() == null) { + flaggable.setFlags(new ReleaseFlags()); + } + flaggable.getFlags().setI038(flag); + } + + @Override + protected Boolean calculateFlag(FlaggedRelease flaggable, StringBuffer rationale) { + Days daysBetween = Days.daysBetween(new DateTime(flaggable.getTender().getTenderPeriod().getStartDate()), + new DateTime(flaggable.getTender().getTenderPeriod().getEndDate())); + rationale.append("Days between: ").append(daysBetween.getDays()).append("; Minimum allowed days: ") + .append(MIN_ALLOWED_DAYS_BIDDING_PERIOD).append(";"); + return daysBetween.getDays() < MIN_ALLOWED_DAYS_BIDDING_PERIOD; + + } + + @Override + protected Collection> getPreconditionsPredicates() { + return Collections.unmodifiableList(Arrays.asList(FlaggedReleasePredicates.OPEN_PROCUREMENT_METHOD, + FlaggedReleasePredicates.TENDER_END_DATE, FlaggedReleasePredicates.TENDER_START_DATE)); + } + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/Merge.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/Merge.java index e5eb1a1f5..74d5d596f 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/Merge.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/Merge.java @@ -16,7 +16,7 @@ * * @see MergeStrategy * - * @author mihai + * @author mpostelnicu * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/MergeStrategy.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/MergeStrategy.java index 26aab1186..d4e1ae14d 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/MergeStrategy.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/merge/MergeStrategy.java @@ -11,7 +11,7 @@ * * @see Merge * - * @author mihai + * @author mpostelnicu * */ public enum MergeStrategy { diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/ReleaseRowImporter.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/ReleaseRowImporter.java index 386f60f3e..213cf35d7 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/ReleaseRowImporter.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/ReleaseRowImporter.java @@ -7,9 +7,9 @@ import java.text.ParseException; /** - * @author mihai + * @author mpostelnicu */ -public abstract class ReleaseRowImporter extends RowImporter { +public abstract class ReleaseRowImporter extends RowImporter { public ReleaseRowImporter(final ReleaseRepository releaseRepository, final ImportService importService, final int skipRows) { diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/RowImporter.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/RowImporter.java index 0e8c4d713..ed9fd1e1c 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/RowImporter.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/reader/RowImporter.java @@ -1,5 +1,6 @@ package org.devgateway.ocds.persistence.mongo.reader; +import java.io.Serializable; import org.apache.poi.ss.usermodel.DateUtil; import org.devgateway.ocds.persistence.mongo.spring.ImportService; import org.slf4j.Logger; @@ -15,14 +16,15 @@ /** * Generic superclass for importing rows from excel data sources * - * @author mihai + * @author mpostelnicu * * @param * - the type of OCDS/dervied entity to be imported + * @param the id type * @param * - the main repository that is able to save */ -public abstract class RowImporter> { +public abstract class RowImporter> { private final Logger logger = LoggerFactory.getLogger(RowImporter.class); diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/FlaggedReleaseRepository.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/FlaggedReleaseRepository.java new file mode 100644 index 000000000..e3c7ee9d5 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/FlaggedReleaseRepository.java @@ -0,0 +1,14 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.repository; + +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; + +/** + * @author mpostelnicu + * + */ +public interface FlaggedReleaseRepository extends GenericReleaseRepository { + +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericOrganizationRepository.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericOrganizationRepository.java index 372ef39ed..6e05f40b1 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericOrganizationRepository.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericOrganizationRepository.java @@ -2,6 +2,7 @@ import org.devgateway.ocds.persistence.mongo.Organization; import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.data.mongodb.repository.Query; import org.springframework.data.repository.NoRepositoryBean; @NoRepositoryBean @@ -10,5 +11,8 @@ public interface GenericOrganizationRepository extends M T findOne(String id); T findByIdOrNameAllIgnoreCase(String id, String name); + + @Query(value = "{'additionalIdentifiers._id': ?0}") + T findByAllIds(String id); } diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericReleaseRepository.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericReleaseRepository.java new file mode 100644 index 000000000..6e1c3f166 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/GenericReleaseRepository.java @@ -0,0 +1,20 @@ +package org.devgateway.ocds.persistence.mongo.repository; + +import org.devgateway.ocds.persistence.mongo.Release; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.data.mongodb.repository.Query; +import org.springframework.data.repository.NoRepositoryBean; + +@NoRepositoryBean +public interface GenericReleaseRepository extends MongoRepository { + + @Query(value = "{ 'planning.budget.projectID' : ?0 }") + T findByBudgetProjectId(String projectId); + + T findByOcid(String ocid); + + T findById(String id); + + @Override + S save(S entity); +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/OrganizationRepository.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/OrganizationRepository.java index 1e9306e40..3bea935b0 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/OrganizationRepository.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/OrganizationRepository.java @@ -3,12 +3,15 @@ */ package org.devgateway.ocds.persistence.mongo.repository; +import java.util.Collection; +import java.util.List; + import org.devgateway.ocds.persistence.mongo.Organization; import org.devgateway.ocds.persistence.mongo.Organization.OrganizationType; import org.springframework.data.mongodb.repository.Query; /** - * @author mihai + * @author mpostelnicu * */ public interface OrganizationRepository extends GenericOrganizationRepository { @@ -18,6 +21,10 @@ public interface OrganizationRepository extends GenericOrganizationRepository findByIdCollection(Collection idCol); - Organization findByIdAndTypes(String id, OrganizationType type); + @Query(value = "{$and: [{'additionalIdentifiers._id': ?0} , { 'types': ?1 } ] }") + Organization findByAllIdsAndType(String id, OrganizationType type); } diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/ReleaseRepository.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/ReleaseRepository.java index d71c572a8..1b761ba0a 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/ReleaseRepository.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/repository/ReleaseRepository.java @@ -1,18 +1,14 @@ +/** + * + */ package org.devgateway.ocds.persistence.mongo.repository; import org.devgateway.ocds.persistence.mongo.Release; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.mongodb.repository.Query; -public interface ReleaseRepository extends MongoRepository { +/** + * @author mpostelnicu + * + */ +public interface ReleaseRepository extends GenericReleaseRepository { - @Query(value = "{ 'planning.budget.projectID' : ?0 }") - Release findByBudgetProjectId(String projectId); - - Release findByOcid(String ocid); - - Release findById(String id); - - @Override - S save(S entity); } diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReflectionsConfiguration.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReflectionsConfiguration.java index 04548e5d5..7a59610ea 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReflectionsConfiguration.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReflectionsConfiguration.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; /** - * @author mihai + * @author mpostelnicu * */ @Configuration diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseCompilerService.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseCompilerService.java index 3565e84a2..94faebf19 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseCompilerService.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseCompilerService.java @@ -33,7 +33,7 @@ import com.google.common.collect.Sets; /** - * @author mihai + * @author mpostelnicu * */ @Service diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseFlaggingService.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseFlaggingService.java new file mode 100644 index 000000000..dcb5725c6 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseFlaggingService.java @@ -0,0 +1,57 @@ +/** + * + */ +package org.devgateway.ocds.persistence.mongo.spring; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.function.Consumer; + +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.flags.AbstractFlaggedReleaseFlagProcessor; +import org.devgateway.ocds.persistence.mongo.flags.processors.release.ReleaseFlagI038Processor; +import org.devgateway.ocds.persistence.mongo.repository.FlaggedReleaseRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +/** + * @author mpostelnicu + * + */ +@Service +public class ReleaseFlaggingService { + + @Autowired + private FlaggedReleaseRepository releaseRepository; + + public static final int FLAGGING_BATCH_SIZE = 5000; + + private final Collection releaseFlagProcessors = + Collections.unmodifiableList(Arrays.asList(ReleaseFlagI038Processor.INSTANCE)); + + private void processAndSaveFlagsForRelease(FlaggedRelease release) { + releaseFlagProcessors.forEach(processor -> processor.process(release)); + releaseRepository.save(release); + } + + public void processAndSaveFlagsForAllReleases(Consumer logMessage) { + + logMessage.accept("RUNNING SCHEMA VALIDATION."); + + int pageNumber = 0; + int processedCount = 0; + + Page page; + do { + page = releaseRepository.findAll(new PageRequest(pageNumber++, FLAGGING_BATCH_SIZE)); + page.getContent().parallelStream().forEach(this::processAndSaveFlagsForRelease); + processedCount += page.getNumberOfElements(); + logMessage.accept("Validated " + processedCount + " releases"); + } while (!page.isLast()); + + logMessage.accept("SCHEMA VALIDATION COMPLETE."); + } +} diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseRecordMonitor.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseRecordMonitor.java index 5cf7c82ab..426fdc97c 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseRecordMonitor.java +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/ReleaseRecordMonitor.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; /** - * @author mihai + * @author mpostelnicu * * AOP Monitor that saves new {@link Release}S in {@link Record}S for * archiving purposes. diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/json/Views.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/json/Views.java new file mode 100644 index 000000000..5c181d3b7 --- /dev/null +++ b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/spring/json/Views.java @@ -0,0 +1,9 @@ +package org.devgateway.ocds.persistence.mongo.spring.json; + +public class Views { + public static class Public { + } + public static class Internal { + } + +} \ No newline at end of file diff --git a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomGroupingOperation.java b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomGroupingOperation.java index d437e86ac..ef1aa591b 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomGroupingOperation.java +++ b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomGroupingOperation.java @@ -7,7 +7,7 @@ import com.mongodb.DBObject; /** - * @author mihai + * @author mpostelnicu * */ public class CustomGroupingOperation extends CustomOperation { diff --git a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomProjectionOperation.java b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomProjectionOperation.java index b19ec2624..4ccbb787f 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomProjectionOperation.java +++ b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomProjectionOperation.java @@ -7,7 +7,7 @@ import com.mongodb.DBObject; /** - * @author mihai + * @author mpostelnicu * */ public class CustomProjectionOperation extends CustomOperation { diff --git a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomSortingOperation.java b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomSortingOperation.java index 6a34b0294..f483f0432 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomSortingOperation.java +++ b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomSortingOperation.java @@ -7,7 +7,7 @@ import com.mongodb.DBObject; /** - * @author mihai + * @author mpostelnicu * */ public class CustomSortingOperation extends CustomOperation { diff --git a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomUnwindOperation.java b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomUnwindOperation.java index ef30fd349..0ec409c5e 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomUnwindOperation.java +++ b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/aggregate/CustomUnwindOperation.java @@ -6,7 +6,7 @@ import com.mongodb.BasicDBObject; /** - * @author mihai + * @author mpostelnicu * */ public class CustomUnwindOperation extends CustomOperation { diff --git a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/spring/MongoTemplateConfiguration.java b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/spring/MongoTemplateConfiguration.java index d9b70b3bc..5b33ffaf7 100644 --- a/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/spring/MongoTemplateConfiguration.java +++ b/persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/spring/MongoTemplateConfiguration.java @@ -9,6 +9,7 @@ import org.devgateway.ocds.persistence.mongo.DefaultLocation; import org.devgateway.ocds.persistence.mongo.Organization; import org.devgateway.ocds.persistence.mongo.Release; +import org.devgateway.ocds.persistence.mongo.flags.FlagsConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,11 +36,16 @@ public void createMandatoryImportIndexes() { mongoTemplate.indexOps(Organization.class).ensureIndex(new Index().on("identifier._id", Direction.ASC)); mongoTemplate.indexOps(Organization.class) .ensureIndex(new Index().on("additionalIdentifiers._id", Direction.ASC)); - mongoTemplate.indexOps(Organization.class).ensureIndex(new Index().on("types", Direction.ASC)); + mongoTemplate.indexOps(Organization.class).ensureIndex( + new Index().on("types", Direction.ASC)); mongoTemplate.indexOps(Organization.class).ensureIndex(new Index().on("name", Direction.ASC).unique()); mongoTemplate.indexOps(DefaultLocation.class).ensureIndex(new Index().on("description", Direction.ASC)); logger.info("Added mandatory Mongo indexes"); } + + public void createCorruptionFlagsIndexes() { + mongoTemplate.indexOps(Release.class).ensureIndex(new Index().on(FlagsConstants.I038_VALUE, Direction.ASC)); + } @PostConstruct public void mongoPostInit() { @@ -48,6 +54,8 @@ public void mongoPostInit() { } public void createPostImportStructures() { + + createCorruptionFlagsIndexes(); // initialize some extra indexes mongoTemplate.indexOps(Release.class).ensureIndex(new Index().on("ocid", Direction.ASC)); @@ -74,9 +82,8 @@ public void createPostImportStructures() { mongoTemplate.indexOps(Release.class).ensureIndex(new Index(). on("tender.items.deliveryLocation.geometry.coordinates", Direction.ASC)); - mongoTemplate.indexOps(Organization.class) - .ensureIndex(new TextIndexDefinitionBuilder().onField("name").onField("id").build()); - + mongoTemplate.indexOps(Organization.class).ensureIndex(new TextIndexDefinitionBuilder().onField("name") + .onField("id").onField("additionalIdentifiers._id").build()); logger.info("Added extra Mongo indexes"); diff --git a/persistence-mongodb/src/main/resources/frequent-tenderers-map.js b/persistence-mongodb/src/main/resources/frequent-tenderers-map.js new file mode 100644 index 000000000..151781f9e --- /dev/null +++ b/persistence-mongodb/src/main/resources/frequent-tenderers-map.js @@ -0,0 +1,23 @@ +function() { + var tenderersSet = new Set(); + this.tender.tenderers.forEach(function(tenderer, it, array) { + tenderersSet.add(tenderer._id); + }); + + if (tenderersSet.size > 1) { + var arr = Array.from(tenderersSet); + for (var i = 0; i < arr.length; i++) { + for (var j = i + 1; j < arr.length; j++) + if (arr[i].localeCompare(arr[j]) > 0) + emit({ + tendererId1: arr[i], + tendererId2: arr[j] + }, 1); + else + emit({ + tendererId1: arr[j], + tendererId2: arr[i] + }, 1); + } + } +}; \ No newline at end of file diff --git a/persistence-mongodb/src/main/resources/frequent-tenderers-reduce.js b/persistence-mongodb/src/main/resources/frequent-tenderers-reduce.js new file mode 100644 index 000000000..5c1a5e302 --- /dev/null +++ b/persistence-mongodb/src/main/resources/frequent-tenderers-reduce.js @@ -0,0 +1,3 @@ +function(key, values) { + return Array.sum(values); +} \ No newline at end of file diff --git a/persistence-mongodb/src/test/java/org/devgateway/ocds/persistence/mongo/spring/json/ReleasePackageJsonImportTest.java b/persistence-mongodb/src/test/java/org/devgateway/ocds/persistence/mongo/spring/json/ReleasePackageJsonImportTest.java index f09d53572..e5ea8f6df 100644 --- a/persistence-mongodb/src/test/java/org/devgateway/ocds/persistence/mongo/spring/json/ReleasePackageJsonImportTest.java +++ b/persistence-mongodb/src/test/java/org/devgateway/ocds/persistence/mongo/spring/json/ReleasePackageJsonImportTest.java @@ -1,15 +1,6 @@ package org.devgateway.ocds.persistence.mongo.spring.json; -import java.io.File; -import java.util.Collection; -import java.util.Set; - -import org.devgateway.ocds.persistence.mongo.Award; -import org.devgateway.ocds.persistence.mongo.Contract; -import org.devgateway.ocds.persistence.mongo.Release; -import org.devgateway.ocds.persistence.mongo.Tag; -import org.devgateway.ocds.persistence.mongo.Tender; -import org.devgateway.ocds.persistence.mongo.Transaction; +import org.devgateway.ocds.persistence.mongo.*; import org.devgateway.ocds.persistence.mongo.repository.ReleaseRepository; import org.devgateway.toolkit.persistence.mongo.AbstractMongoTest; import org.junit.After; @@ -18,6 +9,10 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.io.File; +import java.util.Collection; +import java.util.Set; + /** * @author idobre * @since 6/1/16 @@ -80,7 +75,7 @@ public void importObjectsTenderAmendment() throws Exception { Assert.assertEquals(1, releases.size()); Assert.assertNotNull(importedRelease); - Assert.assertArrayEquals(new String[] {"electronicSubmission"}, + Assert.assertArrayEquals(new Tender.SubmissionMethod[] {Tender.SubmissionMethod.electronicSubmission}, importedRelease.getTender().getSubmissionMethod().toArray()); } diff --git a/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java b/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java index dcabc074c..6b4d15d9f 100644 --- a/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java +++ b/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java @@ -19,7 +19,7 @@ * profile. This will enable a special embedded mongodb server that can be used * just during the test. * - * @author mihai + * @author mpostelnicu * */ public abstract class AbstractMongoTest { diff --git a/persistence-mongodb/src/test/resources/test.properties b/persistence-mongodb/src/test/resources/test.properties index 7a4514c12..4b9df77d7 100644 --- a/persistence-mongodb/src/test/resources/test.properties +++ b/persistence-mongodb/src/test/resources/test.properties @@ -1,5 +1,5 @@ spring.data.mongodb.port=27018 -spring.mongodb.embedded.version=3.2.9 +spring.mongodb.embedded.version=3.2.10 # LOGGING logging.level.root=warn diff --git a/persistence/pom.xml b/persistence/pom.xml index a806d97d6..7e82c16f2 100644 --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -41,6 +41,11 @@ org.springframework.boot spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-data-rest + + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> @@ -68,4 +68,14 @@ + + + + + Enable admin to create users with "Procuring Entity" Role. + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 897d45c9c..d27d6b642 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,10 @@ UTF-8 1.8 3.5.1 - 1.4.1.RELEASE - 10.12.1.1 + 1.4.2.RELEASE + 10.13.1.1 3.14 + 3.14 diff --git a/ui/assets/flags/en_US.png b/ui/assets/flags/en_US.png new file mode 100644 index 000000000..e7ab2b250 Binary files /dev/null and b/ui/assets/flags/en_US.png differ diff --git a/ui/assets/icons/octocat.png b/ui/assets/icons/octocat.png new file mode 100644 index 000000000..8b25551a9 Binary files /dev/null and b/ui/assets/icons/octocat.png differ diff --git a/ui/assets/loading-bubbles.svg b/ui/assets/loading-bubbles.svg new file mode 100644 index 000000000..4020b4d2f --- /dev/null +++ b/ui/assets/loading-bubbles.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/ui/index.jsx b/ui/index.jsx index 8172a3519..2efc4fadb 100644 --- a/ui/index.jsx +++ b/ui/index.jsx @@ -9,14 +9,6 @@ import {fetchJson} from "./oce/tools"; import {Map} from "immutable"; import styles from "./style.less"; -function getBidTypeDescription(__, {id, description}){ - switch(+id){ - case 12: return __("Unspecified") + " #1"; - case 15: return __("Unspecified") + " #2"; - default: return description; - } -} - class OCEChild extends OCApp{ constructor(props) { super(props); @@ -31,7 +23,7 @@ class OCEChild extends OCApp{ fetchJson('/api/ocds/bidType/all').then(data => this.setState({ bidTypes: data.reduce((map, datum) => - map.set(datum.id, getBidTypeDescription(this.__.bind(this), datum)), Map()) + map.set(datum.id, datum.description), Map()) }) ); } @@ -41,8 +33,8 @@ class OCEChild extends OCApp{

- {this.__('e-Procurement')} - {this.__('Toolkit')} + {this.t('general:title')} + {this.t('general:subtitle')}

@@ -50,7 +42,10 @@ class OCEChild extends OCApp{ {this.comparison()} {this.exportBtn()}
-
+
+ {this.loginBox()} +
+
{this.languageSwitcher()}
@@ -60,10 +55,10 @@ class OCEChild extends OCApp{ {this.navigation()}
-

{this.__("Toolkit description")}

+

{this.t('general:description:title')}

- {this.__("The Procurement M&E Prototype is an interactive platform for analyzing, monitoring, and evaluating information on procurement in Vietnam. All data in the dashboard are collected from the Vietnam Government eProcurement system (eGP).")} + {this.t('general:description:content')}

@@ -82,6 +77,10 @@ class OCEChild extends OCApp{ } } +OCEChild.TRANSLATIONS = { + en_US: require('./languages/en_US.json'), +}; + ReactDOM.render(, document.getElementById('dg-container')); if("ocvn.developmentgateway.org" == location.hostname){ diff --git a/ui/languages/en_US.json b/ui/languages/en_US.json new file mode 100644 index 000000000..daedbb486 --- /dev/null +++ b/ui/languages/en_US.json @@ -0,0 +1,126 @@ +{ + "general:comparison:other": "Other", + "general:amountInVND": "Amount (in VND)", + "general:title": "e-Procurement", + "general:subtitle": "Toolkit", + "general:description:title": "Toolkit description", + "general:description:content": "The Procurement M&E Prototype is an interactive platform for analyzing, monitoring, and evaluating information on procurement in Vietnam. All data in the dashboard are collected from the Vietnam Government eProcurement system (eGP). These data are published on a pilot basis and do not represent official government statistics.", + "general:login": "Log in", + "general:logout": "Log out", + "general:viewOnGithub": "View code on Github", + "general:months:1": "Jan", + "general:months:2": "Feb", + "general:months:3": "Mar", + "general:months:4": "Apr", + "general:months:5": "May", + "general:months:6": "Jun", + "general:months:7": "Jul", + "general:months:8": "Aug", + "general:months:9": "Sep", + "general:months:10": "Oct", + "general:months:11": "Nov", + "general:months:12": "Dec", + "general:range:min": "Min", + "general:range:max": "Max", + "general:loading": "Loading...", + "header:comparison:title": "Compare", + "header:comparison:criteria": "Comparison criteria", + "header:comparison:criteria:none": "None", + "header:comparison:criteria:bidType": "Bid Type", + "header:comparison:criteria:bidSelectionMethod": "Bid Selection Method", + "header:comparison:criteria:procuringEntity": "Procuring Entity", + "export:error": "An error occurred during export!", + "export:exporting": "Exporting...", + "export:export": "Export", + "filters:awardValue:title": "Award value", + "filters:title": "Filter the data", + "filters:apply": "Apply", + "filters:reset": "Reset", + "filters:dashboard:save": "Save", + "filters:dashboard:saveForAdmin": "Save for admin", + "filters:dashboard:saveUnassigned": "Save unassigned", + "filters:dashboard:load": "Load", + "filters:dashboard:buttonTitle": "Dashboards", + "filters:dashboard:saveError": "Unexpected error. The dashboard was not saved.", + "filters:dashboard:defaultHint": "You can set your default dashboard in", + "filters:dashboard:profileSettings": "your profile settings", + "filters:dashboard:manageDashboards": "Manage dashboards", + "filters:dashboard:manageUsers": "Manage users", + "filters:procuringEntity:title": "Procuring entity", + "filters:supplier:title": "Supplier", + "filters:tenderPrice:title": "Tender price", + "filters:multipleSelect:selectAll": "Select all", + "filters:multipleSelect:selectNone": "Select none", + "filters:typeAhead:inputPlaceholder": "type search query", + "filters:typeAhead:result:sg": "result", + "filters:typeAhead:result:pl": "results", + "filters:tabs:amounts:title": "Amounts", + "filters:tabs:organizations:title": "Organizations", + "filters:tabs:tenderRules:title": "Tender rules", + "tabs:competitiveness:title": "Competitiveness", + "tabs:eProcurement:title": "E-Procurement", + "tabs:efficiency:title": "Efficiency", + "tabs:overview:title": "Overview", + "tabs:location:title": "Location", + "charts:avgNrBids:xAxisTitle": "Year", + "charts:avgNrBids:yAxisTitle": "Number", + "charts:avgNrBids:title": "Average Number of Bidders Attending One Bid", + "charts:bidPeriod:traces:tender": "Tender", + "charts:bidPeriod:traces:award": "Award", + "charts:bidPeriod:traces:total": "Total:", + "charts:bidPeriod:xAxisTitle": "Number of days", + "charts:bidPeriod:yAxisTitle": "Year", + "charts:bidPeriod:title": "Bid Timeline", + "charts:bidsByItem:title": "Number of invitations to bid by item", + "charts:bidsByItem:xAxisTitle": "Item", + "charts:bidsByItem:yAxisTitle": "Count", + "charts:costEffectiveness:traces:awardPrice": "Award Price", + "charts:costEffectiveness:traces:difference": "Difference", + "charts:costEffectiveness:xAxisTitle": "Year", + "charts:costEffectiveness:yAxisTitle": "Amount (in VND)", + "charts:costEffectiveness:title": "Cost effectiveness", + "charts:general:noData": "No data", + "charts:nrCancelled:title": "Number of cancelled invitations to bid", + "charts:nrCancelled:xAxisTitle": "Year", + "charts:nrCancelled:yAxisTitle": "Count", + "charts:nrEBid:xAxisTitle": "Year", + "charts:nrEBid:yAxisTitle": "Count", + "charts:nrEBid:title": "Number of eBid Awards", + "charts:overview:traces:award": "Award", + "charts:overview:traces:bidplan": "Bidplan", + "charts:overview:traces:tender": "Tender", + "charts:overview:xAxisName": "Year", + "charts:overview:yAxisName": "Count", + "charts:overview:title": "Procurement activity by year", + "charts:percentEBid:xAxisName": "Year", + "charts:percentEBid:yAxisName": "Percent", + "charts:percentEBid:title": "Percent of Tenders Using e-Bid", + "charts:procurementMethod:unspecified": "Unspecified", + "charts:procurementMethod:xAxisName": "Method", + "charts:procurementMethod:yAxisName": "Amount (in VND)", + "charts:procurementMethod:title": "Procurement method", + "charts:cancelledAmounts:xAxisName": "Year", + "charts:cancelledAmounts:yAxisName": "Amount (in VND)", + "charts:cancelledPercents:title": "Cancelled funding (%)", + "charts:cancelledAmounts:title": "Cancelled funding", + "charts:cancelledPercents:xAxisName": "Year", + "charts:cancelledPercents:yAxisName": "Percent", + "maps:tenderLocations:title": "Tender locations", + "maps:tenderLocations:tabs:overview:title": "Overview", + "maps:tenderLocations:tabs:overview:nrOfTenders": "Number of Tenders:", + "maps:tenderLocations:tabs:overview:totalFundingByLocation": "Total Funding for the location", + "tables:top10awards:number": "Number", + "tables:top10awards:date": "Date", + "tables:top10awards:supplier": "Supplier", + "tables:top10awards:value": "Value", + "tables:top10awards:title": "Top 10 largest awards", + "tables:top10tenders:number": "Number", + "tables:top10tenders:startDate": "Start date", + "tables:top10tenders:endDate": "End date", + "tables:top10tenders:procuringEntity": "Procuring entity", + "tables:top10tenders:estimatedValue": "Estimated value", + "tables:top10tenders:title": "Top 10 largest tenders", + "tables:frequentTenderers:supplier": "Supplier", + "tables:frequentTenderers:nrITB": "Number of ITBs in Common", + "tables:frequentTenderers:title": "Frequent Supplier Bidding Combinations" +} diff --git a/ui/oce/comparison.jsx b/ui/oce/comparison.jsx index 8d157f236..1992a937d 100644 --- a/ui/oce/comparison.jsx +++ b/ui/oce/comparison.jsx @@ -2,6 +2,7 @@ import PureRenderCompoent from "./pure-render-component"; import translatable from "./translatable"; import {max, cacheFn, download} from "./tools"; import {List, Set, Map} from "immutable"; +import orgNamesFetching from "./orgnames-fetching"; let computeUniformYears = cacheFn((Component, comparisonData, years) => comparisonData.reduce((res, data) => @@ -9,26 +10,36 @@ let computeUniformYears = cacheFn((Component, comparisonData, years) => , Set()).intersect(years).sort() ); -class Comparison extends translatable(PureRenderCompoent){ +class Comparison extends orgNamesFetching(translatable(PureRenderCompoent)){ getComponent(){ return this.props.Component; } wrap(children){ return
-

{this.getComponent().getName(this.__.bind(this))}

+

{this.getComponent().getName(this.t.bind(this))}

{children}
} + getOrgsWithoutNamesIds(){ + const {comparisonCriteriaValues, compareBy} = this.props; + return "procuringEntityId" == compareBy ? + comparisonCriteriaValues.filter(id => !this.state.orgNames[id]) : + []; + } + getTitle(index){ let {compareBy, bidTypes, comparisonCriteriaValues} = this.props; if("bidTypeId" == compareBy){ - return bidTypes.get(comparisonCriteriaValues[index], this.__('Other')) + return bidTypes.get(comparisonCriteriaValues[index], this.t('general:comparison:other')) + } else if("procuringEntityId" == compareBy){ + const orgId = comparisonCriteriaValues[index]; + return this.state.orgNames[orgId] || orgId; } - return comparisonCriteriaValues[index] || this.__('Other'); + return comparisonCriteriaValues[index] || this.t('general:comparison:other'); } render(){ @@ -60,7 +71,7 @@ class Comparison extends translatable(PureRenderCompoent){ ep: Component.excelEP, filters: comparisonFilters, years, - __: this.__.bind(this) + t: this.t.bind(this) }); return
@@ -88,10 +100,18 @@ class Comparison extends translatable(PureRenderCompoent){ } } +function getInverseFilter(filter){ + switch(filter){ + case 'bidTypeId': return 'notBidTypeId'; + case 'bidSelectionMethod': return 'notBidSelectionMethod'; + case 'procuringEntityId': return 'notProcuringEntityId'; + } +} + Comparison.decorateFilters = cacheFn((filters, compareBy, comparisonCriteriaValues) => List(comparisonCriteriaValues) .map(criteriaValue => filters.set(compareBy, criteriaValue)) - .push(filters.set(compareBy, comparisonCriteriaValues).set('invert', 'true'))); + .push(filters.set(getInverseFilter(compareBy), comparisonCriteriaValues))); Comparison.computeUniformData = cacheFn((Component, comparisonData, years) => comparisonData.map(uniformDatum => diff --git a/ui/oce/filters/award-value.jsx b/ui/oce/filters/award-value.jsx index 7b7561d64..fec573fe8 100644 --- a/ui/oce/filters/award-value.jsx +++ b/ui/oce/filters/award-value.jsx @@ -7,7 +7,7 @@ class AwardValue extends Range{ } getTitle(){ - return this.__('Award value'); + return this.t('filters:awardValue:title'); } } diff --git a/ui/oce/filters/index.jsx b/ui/oce/filters/index.jsx index 39b4dfaa0..35032110e 100644 --- a/ui/oce/filters/index.jsx +++ b/ui/oce/filters/index.jsx @@ -5,14 +5,42 @@ import Organizations from "./tabs/organizations"; import TenderRules from "./tabs/tender-rules"; import Amounts from "./tabs/amounts"; import {Map} from "immutable"; +import {send, fetchJson, callFunc} from "../tools"; +import URI from "urijs"; +import {DropdownButton, MenuItem} from "react-bootstrap"; +import {fromJSON, toJSON} from "transit-immutable-js"; + +const dashboardId = new URI(location).search(true).dashboardId; class Filters extends translatable(Component){ constructor(props){ super(props); this.state = { currentTab: 0, - state: Map() - } + state: Map(), + savingDashboard: false, + dashboardName: "", + dashboards: [] + }; + + const save = ep => () => { + const {state, dashboardName} = this.state; + const encoded = toJSON(state); + send(new URI(`/rest/userDashboards/${ep}`) + .addSearch('name', dashboardName) + .addSearch('formUrlEncodedBody', encoded) + ).then(callFunc('text')).then(response => response.length ? + alert(this.t('filters:dashboard:saveError')) : //response text means error + this.fetchDashboards()//no response text means success, on success, no response is expected + ); + this.setState({ + savingDashboard: false, + dashboardName: "" + }) + }; + + this.saveForCurrentUser = save('saveDashboardForCurrentUser') + this.saveUnassigned = save('saveDashboard'); } listTabs(){ @@ -24,7 +52,7 @@ class Filters extends translatable(Component){ onClick={_ => this.setState({currentTab: index})} > - {Tab.getName(this.__.bind(this))} + {Tab.getName(this.t.bind(this))} ); @@ -47,10 +75,42 @@ class Filters extends translatable(Component){ this.props.onUpdate(Map()) } + fetchDashboards(){ + fetchJson('/rest/userDashboards/search/getDashboardsForCurrentUser') + .then(data => { + const dashboards = data._embedded ? data._embedded.userDashboards : []; + this.setState({dashboards}); + if(dashboardId){ + for(let counter in dashboards){ + const dashboard = dashboards[counter]; + if(dashboard.id == dashboardId){ + this.updateFilters(fromJSON(dashboard.formUrlEncodedBody)); + break; + } + } + } + return data; + }) + .catch(() => null); + } + + componentDidMount(){ + this.fetchDashboards(); + !dashboardId && fetchJson('/rest/userDashboards/search/getDefaultDashboardForCurrentUser') + .then(({formUrlEncodedBody}) => this.updateFilters(fromJSON(formUrlEncodedBody))) + .catch(() => null) + } + + updateFilters(newFilters){ + this.setState({state: newFilters}); + this.props.onUpdate(newFilters); + } + render(){ - let {onClick, onUpdate, open} = this.props; + let {onClick, onUpdate, open, user} = this.props; + const {savingDashboard, dashboardName, dashboards} = this.state; return
- {this.__('Filter the data')} + {this.t('filters:title')}
e.stopPropagation()}>
    {this.listTabs()} @@ -60,12 +120,59 @@ class Filters extends translatable(Component){
  +   + {user.loggedIn && !savingDashboard && + + } + {savingDashboard && + this.setState({dashboardName: e.target.value})} + /> + } +   + {savingDashboard && !user.isAdmin && + + } + {savingDashboard && user.isAdmin && + + this.saveForCurrentUser()}>{this.t('filters:dashboard:saveForAdmin')} + this.saveUnassigned()}>{this.t('filters:dashboard:saveUnassigned')} + + } + {user.loggedIn && !!dashboards.length && + + {dashboards.map(({name, formUrlEncodedBody}, index) => + this.updateFilters(fromJSON(formUrlEncodedBody))}> + {name} + + )} + + } + + {user.loggedIn && !user.isAdmin &&

+ {this.t('filters:dashboard:defaultHint')} +   + {this.t('filters:dashboard:profileSettings')} +

} + + {user.loggedIn && user.isAdmin &&

+ {this.t('filters:dashboard:manageDashboards')} +  |  + {this.t('filters:dashboard:manageUsers')} +

}
diff --git a/ui/oce/filters/inputs/multiple-select.jsx b/ui/oce/filters/inputs/multiple-select.jsx index 09864054b..e9c229960 100644 --- a/ui/oce/filters/inputs/multiple-select.jsx +++ b/ui/oce/filters/inputs/multiple-select.jsx @@ -50,11 +50,11 @@ class MultipleSelect extends translatable(Component){ {this.getTitle()} ({this.getSelectedCount()}/{totalOptions}) diff --git a/ui/oce/filters/inputs/range.jsx b/ui/oce/filters/inputs/range.jsx index 2600132e4..73f2d1178 100644 --- a/ui/oce/filters/inputs/range.jsx +++ b/ui/oce/filters/inputs/range.jsx @@ -15,28 +15,49 @@ let labelFormatter = number => { return number.toFixed(2); } -class MultipleSelect extends translatable(Component){ +class Range extends translatable(Component){ render(){ if(!this.state) return null; - let {onUpdate, minValue, maxValue} = this.props; - let {min, max} = this.state; + const {min, max} = this.state; + const {onUpdate} = this.props; + const minValue = this.props.minValue || min; + const maxValue = this.props.maxValue || max; return (
{this.getTitle()}
- onUpdate(newVal)} - formatLabel={labelFormatter} - /> + onUpdate(newVal)} + formatLabel={labelFormatter} + />
+
+ {this.t('general:range:min')} +   + onUpdate({min: +e.target.value, max: maxValue})} + /> +   + {this.t('general:range:max')} +   + onUpdate({min: minValue, max: +e.target.value})} + /> +
) } } -export default MultipleSelect; +export default Range; diff --git a/ui/oce/filters/inputs/type-ahead.jsx b/ui/oce/filters/inputs/type-ahead.jsx index 2dc261ac1..f8d1ee7f3 100644 --- a/ui/oce/filters/inputs/type-ahead.jsx +++ b/ui/oce/filters/inputs/type-ahead.jsx @@ -1,35 +1,34 @@ import translatable from "../../translatable"; import Component from "../../pure-render-component"; -import {fetchJson} from "../../tools"; +import {fetchJson, shallowCopy} from "../../tools"; import URI from "urijs"; import {fromJS} from "immutable"; +import orgNamesFetching from "../../orgnames-fetching"; -let NAMES = {}; - -class TypeAhead extends translatable(Component){ +class TypeAhead extends orgNamesFetching(translatable(Component)){ constructor(props){ super(props); - this.state = { - query: "", - options: fromJS([]) - }; + this.state.query = ""; + this.state.options = fromJS([]); } - updateQuery(query){ + updateQuery(query){ this.setState({query}); if(query.length >= this.constructor.MIN_QUERY_LENGTH) { fetchJson(new URI(this.constructor.endpoint).addSearch('text', query).toString()) - .then(data => this.setState({options: fromJS(data)})); + .then(data => this.setState({options: fromJS(data)})); } else { this.setState({options: fromJS([])}) } - } + } /* Marks an option as selected */ select(option){ let id = option.get('id'); let name = option.get('name'); - NAMES[id] = name; + let orgNames = shallowCopy(this.state.orgNames); + orgNames[id] = name; + this.setState({orgNames}); this.props.onToggle(id); } @@ -45,17 +44,21 @@ class TypeAhead extends translatable(Component){
} + getOrgsWithoutNamesIds(){ + return this.props.selected.filter(id => !this.state.orgNames[id]).toJS() + } + render(){ - let {query, options} = this.state; + let {query, options, orgNames} = this.state; let {selected, onToggle} = this.props; let haveQuery = query.length >= this.constructor.MIN_QUERY_LENGTH; return (
-
{this.constructor.getName(this.__.bind(this))} ({selected.count()})
+
{this.constructor.getName(this.t.bind(this))} ({selected.count()})
{selected.map(id => this.renderOption({ id, - name: NAMES[id], + name: orgNames[id], checked: true, cb: () => onToggle(id) }))} @@ -63,12 +66,12 @@ class TypeAhead extends translatable(Component){ this.updateQuery(e.target.value)} /> - {haveQuery &&
{this.__n("result", "results", options.count())}
} + {haveQuery &&
{this.t_n('filters:typeAhead:result:sg', 'filters:typeAhead:result:pl', options.count())}
} {options.filter(option => !selected.has(option.get('id'))).map(option => this.renderOption({ id: option.get('id'), diff --git a/ui/oce/filters/procuring-entity.jsx b/ui/oce/filters/procuring-entity.jsx index 750dab225..f98025c79 100644 --- a/ui/oce/filters/procuring-entity.jsx +++ b/ui/oce/filters/procuring-entity.jsx @@ -1,8 +1,8 @@ import TypeAhead from "./inputs/type-ahead"; class ProcuringEntity extends TypeAhead{ - static getName(__){ - return __('Procuring entity'); + static getName(t){ + return t('filters:procuringEntity:title'); } } diff --git a/ui/oce/filters/supplier.jsx b/ui/oce/filters/supplier.jsx index c947ee113..dd11b18be 100644 --- a/ui/oce/filters/supplier.jsx +++ b/ui/oce/filters/supplier.jsx @@ -1,8 +1,8 @@ import TypeAhead from "./inputs/type-ahead.jsx"; class Supplier extends TypeAhead{ - static getName(__){ - return __("Supplier"); + static getName(t){ + return t('filters:supplier:title'); } } diff --git a/ui/oce/filters/tabs/amounts.jsx b/ui/oce/filters/tabs/amounts.jsx index adb79b407..d1372d0cc 100644 --- a/ui/oce/filters/tabs/amounts.jsx +++ b/ui/oce/filters/tabs/amounts.jsx @@ -4,14 +4,16 @@ import AwardValue from "../award-value"; class Amount extends Tab{ renderChild(slug, Component){ - let {state, onUpdate, translations} = this.props; + const {state, onUpdate, translations} = this.props; + const minValue = state.get('min'+slug); + const maxValue = state.get('max'+slug); return { - onUpdate("min"+slug, min); - onUpdate("max"+slug, max); + minValue != min && onUpdate("min"+slug, min); + maxValue != max && onUpdate("max"+slug, max); }} /> } @@ -24,6 +26,6 @@ class Amount extends Tab{ } } -Amount.getName = __ => __('Amounts'); +Amount.getName = t => t('filters:tabs:amounts:title'); export default Amount; diff --git a/ui/oce/filters/tabs/index.jsx b/ui/oce/filters/tabs/index.jsx index 0e838f4b3..9083e33e9 100644 --- a/ui/oce/filters/tabs/index.jsx +++ b/ui/oce/filters/tabs/index.jsx @@ -6,6 +6,7 @@ class Tab extends translatable(React.Component){ let {onUpdate, translations, state} = this.props; let selected = state.get(slug, Set()); return onUpdate(slug, selected.has(id) ? selected.delete(id) : diff --git a/ui/oce/filters/tabs/organizations.jsx b/ui/oce/filters/tabs/organizations.jsx index 8a687cd0c..bda0eb239 100644 --- a/ui/oce/filters/tabs/organizations.jsx +++ b/ui/oce/filters/tabs/organizations.jsx @@ -5,15 +5,17 @@ import {Set} from "immutable"; class Organizations extends Tab{ render(){ - let {state, onUpdate, translations} = this.props; - let selectedProcuringEntitiesId = state.get('procuringEntityId', Set()); return
- {this.renderChild(ProcuringEntity, 'procuringEntityId')} - {this.renderChild(Supplier, 'supplierId')} + {this.constructor.FILTERS.map(([name, component]) => this.renderChild(component, name))}
} } -Organizations.getName = __ => __('Organizations'); +Organizations.getName = t => t('filters:tabs:organizations:title'); + +Organizations.FILTERS = [ + ['procuringEntityId', ProcuringEntity], + ['supplierId', Supplier] +]; export default Organizations; diff --git a/ui/oce/filters/tabs/tender-rules.jsx b/ui/oce/filters/tabs/tender-rules.jsx index 425013232..19030b53f 100644 --- a/ui/oce/filters/tabs/tender-rules.jsx +++ b/ui/oce/filters/tabs/tender-rules.jsx @@ -6,6 +6,6 @@ class TenderRules extends Tab{ } } -TenderRules.getName = __ => __('Tender rules'); +TenderRules.getName = t => t('filters:tabs:tenderRules:title'); export default TenderRules; \ No newline at end of file diff --git a/ui/oce/filters/tender-price.jsx b/ui/oce/filters/tender-price.jsx index 3f15eea77..17089d9c2 100644 --- a/ui/oce/filters/tender-price.jsx +++ b/ui/oce/filters/tender-price.jsx @@ -4,10 +4,10 @@ import {fetchJson} from "../tools"; class TenderPrice extends Range{ componentDidMount(){ fetchJson('/api/tenderValueInterval').then(([{minTenderValue: min, maxTenderValue: max}]) => this.setState({min, max})) - } + getTitle(){ - return this.__('Tender price'); + return this.t('filters:tenderPrice:title'); } } diff --git a/ui/oce/index.jsx b/ui/oce/index.jsx index 75815de5e..e2cdc8223 100644 --- a/ui/oce/index.jsx +++ b/ui/oce/index.jsx @@ -10,6 +10,7 @@ const MIN_YEAR = 2010; const MAX_YEAR = 2020; const MENU_BOX_COMPARISON = "menu-box"; const MENU_BOX_FILTERS = 'filters'; +const ROLE_ADMIN = 'ROLE_ADMIN'; class OCApp extends React.Component{ constructor(props){ @@ -17,18 +18,23 @@ class OCApp extends React.Component{ this.tabs = []; this.state = { exporting: false, - locale: localStorage.locale || "us", + locale: localStorage.oceLocale || "en_US", width: 0, currentTab: 0, menuBox: "", compareBy: "", comparisonCriteriaValues: [], selectedYears: Set(range(MIN_YEAR, MAX_YEAR)), + selectedMonths: Set(range(1, 12)), filters: fromJS({}), data: fromJS({}), comparisonData: fromJS({}), bidTypes: fromJS({}), - years: fromJS([]) + years: fromJS([]), + user: { + loggedIn: false, + isAdmin: false + } } } @@ -36,8 +42,9 @@ class OCApp extends React.Component{ this.tabs.push(tab); } - __(text){ - return this.constructor.TRANSLATIONS[this.state.locale][text] || text; + t(text){ + const {locale} = this.state; + return this.constructor.TRANSLATIONS[locale][text]; } updateComparisonCriteria(criteria){ @@ -68,9 +75,28 @@ class OCApp extends React.Component{ })) } + fetchUserInfo(){ + fetchJson('/rest/userDashboards/getCurrentAuthenticatedUserDetails').then( + ({username, id, roles}) => this.setState({ + user: { + loggedIn: true, + isAdmin: roles.some(({authority}) => authority == ROLE_ADMIN), + id + } + }) + ).catch( + () => this.setState({ + user: { + loggedIn: false + } + }) + ) + } + componentDidMount(){ this.fetchBidTypes(); this.fetchYears(); + this.fetchUserInfo(); this.setState({ width: document.querySelector('.years-bar').offsetWidth - 30 @@ -90,12 +116,13 @@ class OCApp extends React.Component{ } filters(){ - let {menuBox, bidTypes, locale} = this.state; + let {menuBox, bidTypes, locale, user} = this.state; return this.setMenuBox(e, MENU_BOX_FILTERS)} onUpdate={filters => this.setState({filters, menuBox: ""})} open={menuBox == MENU_BOX_FILTERS} bidTypes={bidTypes} + user={user} translations={this.constructor.TRANSLATIONS[locale]} /> } @@ -106,10 +133,10 @@ class OCApp extends React.Component{ onClick={e => this.setMenuBox(e, MENU_BOX_COMPARISON)} className={cn("filters compare", {open: menuBox == MENU_BOX_COMPARISON})} > - {this.__('Compare')} + {this.t('header:comparison:title')}
e.stopPropagation()}>
- +
@@ -136,7 +163,7 @@ class OCApp extends React.Component{   - {getName(this.__.bind(this))} + {getName(this.t.bind(this))} } @@ -171,9 +198,9 @@ class OCApp extends React.Component{ />; } - yearsBar(){ - let {years, selectedYears} = this.state; - return this.state.years.sort().map(year => + yearsBar(){ + const {years, selectedYears} = this.state; + return years.sort().map(year => this.setState({ + selectedMonths: selectedMonths.has(+month) ? + selectedMonths.delete(+month) : + selectedMonths.add(+month) + })} + > + {this.t(`general:months:${month}`)} + ) + } + setLocale(locale){ this.setState({locale}); - localStorage.locale = locale; + localStorage.oceLocale = locale; + } + + loginBox(){ + if(this.state.user.loggedIn){ + return + {this.t("general:logout")} + + } + return + {this.t("general:login")} + } languageSwitcher(){ return Object.keys(this.constructor.TRANSLATIONS).map(locale => - {`${locale} this.setLocale(locale)} @@ -213,7 +272,7 @@ class OCApp extends React.Component{ ep: 'excelExport', filters, years, - __: this.__.bind(this) + t: this.t.bind(this) }).then(onDone).catch(onDone); } @@ -224,14 +283,14 @@ class OCApp extends React.Component{
- {this.__('Exporting...')} + {this.t('export:exporting')}
) } return
this.downloadExcel()}> - {this.__('Export')} + {this.t('export:export')}
} } diff --git a/ui/oce/orgnames-fetching.es6 b/ui/oce/orgnames-fetching.es6 new file mode 100644 index 000000000..236f867f3 --- /dev/null +++ b/ui/oce/orgnames-fetching.es6 @@ -0,0 +1,38 @@ +import URI from "urijs"; +import {send, callFunc, shallowCopy} from "./tools"; + +const orgNamesFetching = Class => class extends Class{ + constructor(...args){ + super(...args); + this.state = this.state || {}; + this.state.orgNames = {}; + } + + getOrgName(id){ + return this.state.orgNames[id] || id; + } + + maybeFetchOrgNames(){ + const idsWithoutNames = this.getOrgsWithoutNamesIds(); + if(!idsWithoutNames.length) return; + send(new URI('/api/ocds/organization/ids').addSearch('id', idsWithoutNames)) + .then(callFunc('json')) + .then(orgs => { + let orgNames = shallowCopy(this.state.orgNames); + orgs.forEach(({id, name}) => orgNames[id] = name); + this.setState({orgNames}) + }) + } + + componentDidMount(){ + super.componentDidMount && super.componentDidMount(); + this.maybeFetchOrgNames(); + } + + componentDidUpdate(...args){ + super.componentDidUpdate && super.componentDidUpdate(...args); + this.maybeFetchOrgNames(); + } +}; + +export default orgNamesFetching; \ No newline at end of file diff --git a/ui/oce/style.less b/ui/oce/style.less index 7b60aed2f..4c3d912c5 100644 --- a/ui/oce/style.less +++ b/ui/oce/style.less @@ -54,4 +54,15 @@ .InputRange-label--min, .InputRange-label--max{ display: none; } +} + +.range-inputs{ + margin-bottom: 10px; + width: 375px; + margin-left: auto; + margin-right: auto; + input{ + width: 150px; + display: inline-block; + } } \ No newline at end of file diff --git a/ui/oce/tabs/competitiveness.jsx b/ui/oce/tabs/competitiveness.jsx index 831d8c53c..5fe2d599b 100644 --- a/ui/oce/tabs/competitiveness.jsx +++ b/ui/oce/tabs/competitiveness.jsx @@ -2,11 +2,12 @@ import Tab from "./index"; import CostEffectiveness from "../visualizations/charts/cost-effectiveness"; import AvgNrBids from "../visualizations/charts/avg-nr-bids"; import ProcurementMethod from "../visualizations/charts/procurement-method"; +import FrequentTenderers from "../visualizations/tables/frequent-tenderers"; class Competitiveness extends Tab{ - static getName(__){return __('Competitiveness')} + static getName(t){return t('tabs:competitiveness:title')} } Competitiveness.icon = "competitive"; -Competitiveness.visualizations = [CostEffectiveness, ProcurementMethod, AvgNrBids]; +Competitiveness.visualizations = [CostEffectiveness, ProcurementMethod, AvgNrBids, FrequentTenderers]; export default Competitiveness; \ No newline at end of file diff --git a/ui/oce/tabs/e-procurement.jsx b/ui/oce/tabs/e-procurement.jsx index 68f184a64..5ba4e38e1 100644 --- a/ui/oce/tabs/e-procurement.jsx +++ b/ui/oce/tabs/e-procurement.jsx @@ -3,7 +3,7 @@ import PercentEBid from "../visualizations/charts/percent-e-bid"; import NrEbid from "../visualizations/charts/nr-e-bid"; class EProcurement extends Tab{ - static getName(__){return __('E-Procurement')} + static getName(t){return t('tabs:eProcurement:title')} } EProcurement.icon = "eprocurement"; diff --git a/ui/oce/tabs/efficiency.jsx b/ui/oce/tabs/efficiency.jsx index 1820995ef..4a9205388 100644 --- a/ui/oce/tabs/efficiency.jsx +++ b/ui/oce/tabs/efficiency.jsx @@ -5,10 +5,10 @@ import NrCancelled from "../visualizations/charts/nr-cancelled"; import BidsByItem from "../visualizations/charts/bids-by-item"; class Efficiency extends Tab{ - static getName(__){return __('Efficiency')} + static getName(t){return t('tabs:efficiency:title')} } Efficiency.icon = "efficiency"; -Efficiency.visualizations = [BidPeriod, Cancelled, NrCancelled, BidsByItem]; +Efficiency.visualizations = [BidPeriod, BidsByItem, Cancelled, NrCancelled]; export default Efficiency; diff --git a/ui/oce/tabs/index.jsx b/ui/oce/tabs/index.jsx index 8ea896728..8ceb97eda 100644 --- a/ui/oce/tabs/index.jsx +++ b/ui/oce/tabs/index.jsx @@ -13,7 +13,7 @@ class Tab extends Visualization{ let exportable = Component.prototype instanceof Chart; return dontWrap ? rendered :

- {getName(this.__.bind(this))} + {getName(this.t.bind(this))} {exportable && Component.excelEP && } {exportable &&
this.setState({dropdownOpen: !dropdownOpen})}>
    {LAYERS.map((layer, index) =>
  • this.setState({currentLayer: index})}> - {LAYERS[index].getLayerName(this.__.bind(this))} + {LAYERS[index].getLayerName(this.t.bind(this))}
    • )} diff --git a/ui/oce/tabs/overview.jsx b/ui/oce/tabs/overview.jsx index 54fd5dec5..b3b294257 100644 --- a/ui/oce/tabs/overview.jsx +++ b/ui/oce/tabs/overview.jsx @@ -4,9 +4,7 @@ import TendersTable from "../visualizations/tables/tenders"; import AwardsTable from "../visualizations/tables/awards"; class Overview extends Tab{ - static getName(__){ - return __("Overview") - } + static getName(t){return t('tabs:overview:title')} } Overview.visualizations = [OverviewChart, TendersTable, AwardsTable]; diff --git a/ui/oce/tools.es6 b/ui/oce/tools.es6 index 925d6a55a..be4abc91c 100644 --- a/ui/oce/tools.es6 +++ b/ui/oce/tools.es6 @@ -44,15 +44,23 @@ export var cacheFn = fn => { export let max = (a, b) => a > b ? a : b; -export let download = ({ep, filters, years, __}) => { - let url = new URI(`/api/ocds/${ep}`).addSearch(filters.toJS()).addSearch('year', years.toArray()); - return fetch(url.clone().query(""), { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded' - }, - body: url.query() - }).then(response => { +//takes and URI object and makes a POST request to it's base url and query as payload +export const send = url => fetch(url.clone().query(""), { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + credentials: 'same-origin', + body: url.query() +}); + +export let download = ({ep, filters, years, t}) => + send(new URI(`/api/ocds/${ep}`) + .addSearch(filters.toJS()) + .addSearch('year', years.toArray()) + //this sin shall be atoned for in the future + .addSearch('language', localStorage.oceLocale) + ).then(response => { let {userAgent} = navigator; let isSafari = -1 < userAgent.indexOf("Safari") && -1 == userAgent.indexOf("Chrom");//excludes both Chrome and Chromium if(isSafari){ @@ -69,6 +77,15 @@ export let download = ({ep, filters, years, __}) => { }); return response; }).catch(() => { - alert(__("An error occurred during export!")); + alert(t('export:error')); }); -} \ No newline at end of file + +export const shallowCopy = original => { + let copy = {}; + Object.keys(original).forEach(key => copy[key] = original[key]); + return copy; +}; + +export const arrReplace = (a, b, [head, ...tail]) => "undefined" == typeof head ? + tail : + [a == head ? b : head].concat(arrReplace(a, b, tail)); \ No newline at end of file diff --git a/ui/oce/translatable.jsx b/ui/oce/translatable.jsx index 2f68448f6..9c9bb5623 100644 --- a/ui/oce/translatable.jsx +++ b/ui/oce/translatable.jsx @@ -1,13 +1,25 @@ var translatable = Class => class Translatable extends Class{ __(text){ + console.warn('__ is deprecated, use t'); var translations = this.props.translations || {}; - if(!this.props.translations) console.error('Missing translations', this.constructor.name); return translations[text] || text; } __n(sg, pl, n){ + console.warn('__n is deprecated, use t_n'); return n + " " + this.__(1 == n ? sg : pl); } + + t(key){ + let {translations} = this.props; + if(!translations) console.error('Missing translations', this.constructor.name); + if(!translations[key]) console.error('Missing translation for key', key); + return translations[key]; + } + + t_n(sg, pl, n){ + return n + " " + this.t(1 == n ? sg : pl); + } }; export default translatable; \ No newline at end of file diff --git a/ui/oce/visualization.es6 b/ui/oce/visualization.es6 index b239cea8e..dc0cd8327 100644 --- a/ui/oce/visualization.es6 +++ b/ui/oce/visualization.es6 @@ -14,6 +14,12 @@ let fetchEP = url => fetch(url.clone().query(""), { }).then(callFunc('json')); class Visualization extends translatable(Component){ + constructor(...args){ + super(...args); + this.state = this.state || {}; + this.state.loading = true; + } + buildUrl(ep){ let {filters} = this.props; return new URI(API_ROOT + '/' + ep).addSearch(filters.toJS()); @@ -26,7 +32,12 @@ class Visualization extends translatable(Component){ if(endpoint) promise = fetchEP(this.buildUrl(endpoint)); if(endpoints) promise = Promise.all(endpoints.map(this.buildUrl.bind(this)).map(fetchEP)); if(!promise) return; - promise.then(this.transform).then(fromJS).then(data => requestNewData([], data)); + this.setState({loading: true}); + promise + .then(this.transform) + .then(fromJS) + .then(data => requestNewData([], data)) + .then(() => this.setState({loading: false})); } transform(data){return data;} diff --git a/ui/oce/visualizations/charts/avg-nr-bids.jsx b/ui/oce/visualizations/charts/avg-nr-bids.jsx index c42160d06..209909b9d 100644 --- a/ui/oce/visualizations/charts/avg-nr-bids.jsx +++ b/ui/oce/visualizations/charts/avg-nr-bids.jsx @@ -20,11 +20,11 @@ class AvgNrBids extends FrontendYearFilterableChart{ getLayout(){ return { xaxis: { - title: this.__("Year"), + title: this.t('charts:avgNrBids:xAxisTitle'), type: "category" }, yaxis: { - title: this.__("Number"), + title: this.t('charts:avgNrBids:yAxisTitle'), hoverformat: '.2f' } } @@ -33,7 +33,7 @@ class AvgNrBids extends FrontendYearFilterableChart{ AvgNrBids.endpoint = 'averageNumberOfTenderers'; AvgNrBids.excelEP = 'averageNumberBidsExcelChart'; -AvgNrBids.getName = __ => __('Average number of bids'); +AvgNrBids.getName = t => t('charts:avgNrBids:title'); AvgNrBids.getFillerDatum = year => Map({ year, averageNoTenderers: 0 diff --git a/ui/oce/visualizations/charts/bid-period.jsx b/ui/oce/visualizations/charts/bid-period.jsx index a84f93230..a1eb69ab2 100644 --- a/ui/oce/visualizations/charts/bid-period.jsx +++ b/ui/oce/visualizations/charts/bid-period.jsx @@ -25,7 +25,7 @@ class BidPeriod extends FrontendYearFilterableChart { return [{ x: data.map(pluckImm('tender')).map(ensureNonNegative).toArray(), y: years, - name: this.__("Tender"), + name: this.t('charts:bidPeriod:traces:tender'), type: "bar", orientation: 'h', marker: { @@ -34,7 +34,7 @@ class BidPeriod extends FrontendYearFilterableChart { }, { x: data.map(pluckImm('award')).map(ensureNonNegative).toArray(), y: years, - name: this.__("Award"), + name: this.t('charts:bidPeriod:traces:award'), type: "bar", orientation: 'h', marker: { @@ -54,7 +54,7 @@ class BidPeriod extends FrontendYearFilterableChart { x: sum, xanchor: 'left', yanchor: 'middle', - text: this.__('Total:') + ' ' + sum, + text: this.t('charts:bidPeriod:traces:total') + ' ' + sum, showarrow: false } }).toArray(); @@ -64,11 +64,11 @@ class BidPeriod extends FrontendYearFilterableChart { annotations, barmode: "stack", xaxis: { - title: this.__("Number of days"), + title: this.t('charts:bidPeriod:xAxisTitle'), hoverformat: '.2f' }, yaxis: { - title: this.__("Year"), + title: this.t('charts:bidPeriod:yAxisTitle'), type: "category" } } @@ -77,7 +77,7 @@ class BidPeriod extends FrontendYearFilterableChart { BidPeriod.endpoints = ['averageTenderPeriod', 'averageAwardPeriod']; BidPeriod.excelEP = 'bidTimelineExcelChart'; -BidPeriod.getName = __ => __('Bid Timeline'); +BidPeriod.getName = t => t('charts:bidPeriod:title'); BidPeriod.horizontal = true; BidPeriod.getFillerDatum = year => Map({ year, diff --git a/ui/oce/visualizations/charts/bids-by-item.jsx b/ui/oce/visualizations/charts/bids-by-item.jsx index 91b8b5df3..4cfce9cfe 100644 --- a/ui/oce/visualizations/charts/bids-by-item.jsx +++ b/ui/oce/visualizations/charts/bids-by-item.jsx @@ -4,9 +4,7 @@ import Comparison from "../../comparison"; import backendYearFilterable from "../../backend-year-filterable"; class BidsByItem extends backendYearFilterable(Chart){ - static getName(__){ - return __('Number of bids by item'); - } + static getName(t){return t('charts:bidsByItem:title')} getData(){ let data = super.getData(); @@ -40,11 +38,11 @@ class BidsByItem extends backendYearFilterable(Chart){ getLayout(){ return { xaxis: { - title: this.__("Item"), + title: this.t('charts:bidsByItem:xAxisTitle'), type: "category" }, yaxis: { - title: this.__("Count") + title: this.t('charts:bidsByItem:yAxisTitle') } } } @@ -57,7 +55,7 @@ BidsByItem.UPDATABLE_FIELDS = ['data']; class BidsByItemComparison extends Comparison{ render(){ let {compareBy, comparisonData, comparisonCriteriaValues, filters, requestNewComparisonData, years, translations, - styling} = this.props; + styling, width} = this.props; if(!comparisonCriteriaValues.length) return null; let Component = this.getComponent(); let decoratedFilters = this.constructor.decorateFilters(filters, compareBy, comparisonCriteriaValues); @@ -108,16 +106,18 @@ class BidsByItemComparison extends Comparison{ return this.wrap(decoratedFilters.map((comparisonFilters, index) => { let ref = `visualization${index}`; return
    - requestNewComparisonData([index], data)} - data={uniformData.get(index)} - years={years} - title={this.getTitle(index)} - translations={translations} - styling={styling} - {...rangeProp} - /> + requestNewComparisonData([index], data)} + data={uniformData.get(index)} + years={years} + title={this.getTitle(index)} + translations={translations} + styling={styling} + width={width/2} + {...rangeProp} + />
    this.refs[ref].querySelector(".modebar-btn:first-child").click()} > @@ -125,7 +125,7 @@ class BidsByItemComparison extends Comparison{
    -
+

})); } } @@ -133,4 +133,4 @@ class BidsByItemComparison extends Comparison{ BidsByItem.compareWith = BidsByItemComparison; -export default BidsByItem; \ No newline at end of file +export default BidsByItem;; \ No newline at end of file diff --git a/ui/oce/visualizations/charts/cancelled/amounts.jsx b/ui/oce/visualizations/charts/cancelled/amounts.jsx index b37fa6e49..4cb8ff73f 100644 --- a/ui/oce/visualizations/charts/cancelled/amounts.jsx +++ b/ui/oce/visualizations/charts/cancelled/amounts.jsx @@ -43,11 +43,11 @@ class CancelledFunding extends FrontendYearFilterableChart{ getLayout(){ return { xaxis: { - title: this.__("Year"), + title: this.t('charts:cancelledAmounts:xAxisName'), type: 'category' }, yaxis: { - title: this.__("Amount (in VND)") + title: this.t('charts:cancelledAmounts:yAxisName') } } } diff --git a/ui/oce/visualizations/charts/cancelled/index.jsx b/ui/oce/visualizations/charts/cancelled/index.jsx index 43b151ad2..173fd77f7 100644 --- a/ui/oce/visualizations/charts/cancelled/index.jsx +++ b/ui/oce/visualizations/charts/cancelled/index.jsx @@ -20,7 +20,7 @@ class Cancelled extends translatable(React.Component){ let Chart = percents ? Percents : Amounts; return

- {percents ? this.__('Cancelled funding (%)') : this.__('Cancelled funding')} + {percents ? this.t('charts:cancelledPercents:title') : this.t('charts:cancelledAmounts:title')}  

@@ -56,19 +56,17 @@ class LocationWrapper extends translatable(Component){ class Tab extends translatable(Component){} export class OverviewTab extends Tab{ - static getName(__){ - return __('Overview'); - } + static getName(t){return t('maps:tenderLocations:tabs:overview:title')} render(){ let {data} = this.props; let {count, amount} = data; return

- {this.__('Number of Tenders:')} {count} + {this.t('maps:tenderLocations:tabs:overview:nrOfTenders')} {count}

- {this.__('Total Funding for the location:')} {amount.toLocaleString()} + {this.t('maps:tenderLocations:tabs:overview:totalFundingByLocation')} {amount.toLocaleString()}

} @@ -104,7 +102,7 @@ export class ChartTab extends Tab{ ep: this.constructor.Chart.excelEP, filters: decoratedFilters, years, - __: this.__.bind(this) + t: this.t.bind(this) }); return
- {this.__('Number')} - {this.__('Date')} - {this.__('Supplier')} - {this.__('Value')} + {this.t('tables:top10awards:number')} + {this.t('tables:top10awards:date')} + {this.t('tables:top10awards:supplier')} + {this.t('tables:top10awards:value')} @@ -36,7 +36,7 @@ class Awards extends Table{ } } -Awards.getName = __ => __('Top 10 largest awards'); +Awards.getName = t => t('tables:top10awards:title'); Awards.endpoint = 'topTenLargestAwards'; export default Awards; \ No newline at end of file diff --git a/ui/oce/visualizations/tables/frequent-tenderers.jsx b/ui/oce/visualizations/tables/frequent-tenderers.jsx new file mode 100644 index 000000000..4b137713c --- /dev/null +++ b/ui/oce/visualizations/tables/frequent-tenderers.jsx @@ -0,0 +1,57 @@ +import Table from "./index"; +import orgNamesFetching from "../../orgnames-fetching"; +import {pluckImm} from "../../tools"; + +class FrequentTenderers extends orgNamesFetching(Table){ + constructor(...args){ + super(...args); + this.state = this.state || {}; + this.state.showAll = false; + } + + row(entry, index){ + return + {this.getOrgName(entry.getIn(['id', 'tendererId1']))} + {this.getOrgName(entry.getIn(['id', 'tendererId2']))} + {entry.get('value')} + + } + + maybeSlice(flag, list){ + return flag ? list.slice(0, 10) : list; + } + + getOrgsWithoutNamesIds(){ + if(!this.props.data) return []; + return this.props.data.map(pluckImm('id')).flatten().filter(id => !this.state.orgNames[id]).toJS(); + } + + render(){ + if(!this.props.data) return null; + const {showAll} = this.state; + return + + + + + + + + + {this.maybeSlice(!showAll, this.props.data).map(this.row.bind(this))} + {!showAll && this.props.data.count() > 10 && + + } + +
{this.t('tables:frequentTenderers:supplier')} #1{this.t('tables:frequentTenderers:supplier')} #2{this.t('tables:frequentTenderers:nrITB')}
+ +
+ } +} + +FrequentTenderers.getName = t => t('tables:frequentTenderers:title'); +FrequentTenderers.endpoint = 'frequentTenderers'; + +export default FrequentTenderers; \ No newline at end of file diff --git a/ui/oce/visualizations/tables/tenders.jsx b/ui/oce/visualizations/tables/tenders.jsx index 7cacac68d..c2a54586e 100644 --- a/ui/oce/visualizations/tables/tenders.jsx +++ b/ui/oce/visualizations/tables/tenders.jsx @@ -21,11 +21,11 @@ class Tenders extends Table{ - - - - - + + + + + @@ -36,7 +36,7 @@ class Tenders extends Table{ } } -Tenders.getName = __ => __('Top 10 largest tenders'); +Tenders.getName = t => t('tables:top10tenders:title'); Tenders.endpoint = 'topTenLargestTenders'; export default Tenders; \ No newline at end of file diff --git a/ui/package.json b/ui/package.json index 713d888d7..9d34785a5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -46,14 +46,15 @@ "classnames": "^2.2.3", "css-loader": "^0.17.0", "d3": "^3.5.13", - "exports-loader": "^0.6.2", "eslint": "^3.7.0", "eslint-config-airbnb": "^12.0.0", "eslint-import-resolver-webpack": "^0.6.0", "eslint-plugin-import": "^1.16.0", + "exports-loader": "^0.6.2", "gulp": "^3.9.0", "gulp-npm-files": "^0.1.2", "gulp-util": "^3.0.7", + "immutable": "^3.8.1", "imports-loader": "^0.6.5", "jest-cli": "^13.0.0", "json-loader": "^0.5.4", @@ -64,12 +65,15 @@ "plotly.js": "^1.5.1", "react": "^15.3.1", "react-addons-test-utils": "^15.1.0", + "react-bootstrap": "^0.30.6", "react-dom": "^15.3.1", "react-hot-loader": "^1.3.0", "react-immutable-proptypes": "^1.2.0", "react-input-range": "^0.9.2", "react-leaflet": "^0.10.0", "style-loader": "^0.12.3", + "transit-immutable-js": "^0.6.0", + "transit-js": "^0.8.846", "urijs": "^1.17.1", "webpack": "^1.12.0", "webpack-dev-server": "^1.10.1", diff --git a/ui/pom.xml b/ui/pom.xml index 5643b3bc7..ed5ee69b7 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -83,7 +83,7 @@ com.github.eirslett frontend-maven-plugin - 0.0.29 + 1.3 @@ -93,8 +93,8 @@ generate-resources - v4.2.2 - 2.14.9 + v6.9.1 + 3.10.8 diff --git a/ui/style.less b/ui/style.less index b1da8431d..84dabf5d3 100644 --- a/ui/style.less +++ b/ui/style.less @@ -53,12 +53,26 @@ header.branding{ } } - .language-switcher{ + .header-icons.user-tools{ + font-size: 1em; + .glyphicon { + color: #f0f0f0; + } + a{ + color: white; + text-transform: uppercase; + &, :hover{ + text-decoration: none; + } + } + } + + .header-icons{ cursor: pointer; display: flex; align-items: center; justify-content: center; - .flag { + .icon { box-shadow: 0px 1px 10px 1px #B53636; -webkit-box-shadow: 0px 1px 10px 1px #B53636; -moz-box-shadow: 0px 1px 10px 1px #B53636; @@ -101,15 +115,18 @@ aside { } } -.years-bar { +@yearsBarBottom: 34px; +@yearsBarHeight: 30px; + +.years-bar, .months-bar { position: fixed; - bottom: 34px; + bottom: @yearsBarBottom; border-bottom: 2px solid #c5c5c5; z-index: 1; padding-left: 0; padding-right: 0; display: table; - height: 30px; + height: @yearsBarHeight; a { display: table-cell; background-color: #e6e6e6; @@ -136,6 +153,10 @@ aside { } } +.months-bar{ + bottom: @yearsBarBottom + @yearsBarHeight + 1; +} + footer.main-footer{ position: fixed; height: 34px; @@ -194,7 +215,7 @@ aside [role=navigation] a{ margin-top: 64px; padding-right: 0; overflow: hidden; - &>div{ + .leaflet-container{ height: 95vh; } } @@ -359,4 +380,14 @@ aside [role=navigation] a{ .checkbox{ width: 100%; } +} + +.dashboard-name{ + width: 100px; + display: inline-block; +} + +.dashboard-hint{ + text-transform: none; + margin-top: 10px; } \ No newline at end of file diff --git a/ui/webpack.dev.config.js b/ui/webpack.dev.config.js index 31b056cf5..b3e3aab5e 100644 --- a/ui/webpack.dev.config.js +++ b/ui/webpack.dev.config.js @@ -17,8 +17,7 @@ module.exports = { test: /\.(jsx|es6)$/, loaders: [ 'react-hot', - 'babel-loader?babelrc=false,presets[]=react,presets[]=es2015,cacheDirectory', - 'eslint-loader' + 'babel-loader?babelrc=false,presets[]=react,presets[]=es2015,cacheDirectory' ], exclude: /node_modules/ }, diff --git a/web/pom.xml b/web/pom.xml index 3b943d105..3e08b4a68 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -65,6 +65,12 @@ spring-boot-starter-actuator + + org.springframework.security + spring-security-test + test + + cz.jirutka.validator validator-collection diff --git a/web/src/main/java/org/devgateway/ocds/web/cache/generators/GenericPagingRequestKeyGenerator.java b/web/src/main/java/org/devgateway/ocds/web/cache/generators/GenericPagingRequestKeyGenerator.java index f2595960f..c96026517 100644 --- a/web/src/main/java/org/devgateway/ocds/web/cache/generators/GenericPagingRequestKeyGenerator.java +++ b/web/src/main/java/org/devgateway/ocds/web/cache/generators/GenericPagingRequestKeyGenerator.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** - * @author mihai {@link KeyGenerator} for {@link RequestMapping}S that use + * @author mpostelnicu {@link KeyGenerator} for {@link RequestMapping}S that use * {@link GenericPagingRequest} This will use the default * Jackson's {@link ObjectMapper} to produce JSON from the input bean * plus takes into account the target ( diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/CostEffectivenessVisualsController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/CostEffectivenessVisualsController.java index ef06d4bcd..69b993c61 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/CostEffectivenessVisualsController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/CostEffectivenessVisualsController.java @@ -165,13 +165,15 @@ public List costEffectivenessTenderAmount( Aggregation agg = Aggregation.newAggregation( match(where("tender.status").is(Tender.Status.active.toString()).and("tender.tenderPeriod.startDate") - .exists(true).andOperator(getYearDefaultFilterCriteria(filter, "tender.tenderPeriod.startDate"))), + .exists(true) + .andOperator(getYearDefaultFilterCriteria(filter, "tender.tenderPeriod.startDate"))), getMatchDefaultFilterOperation(filter), unwind("$awards"), new CustomProjectionOperation(project), new CustomGroupingOperation(group1), getTopXFilterOperation(filter, "$year").sum("tenderWithAwardsValue").as(Keys.TOTAL_TENDER_AMOUNT) - .count() - .as(Keys.TOTAL_TENDERS).sum("tenderWithAwards").as(Keys.TOTAL_TENDER_WITH_AWARDS), - new CustomProjectionOperation(project2), sort(Direction.ASC, Fields.UNDERSCORE_ID), + .count().as(Keys.TOTAL_TENDERS).sum("tenderWithAwards").as(Keys.TOTAL_TENDER_WITH_AWARDS), + new CustomProjectionOperation(project2), + filter.getGroupByCategory() != null ? sort(Direction.DESC, Keys.TOTAL_TENDER_AMOUNT) + : sort(Direction.ASC, Fields.UNDERSCORE_ID), skip(filter.getSkip()), limit(filter.getPageSize())); AggregationResults results = mongoTemplate.aggregate(agg, "release", DBObject.class); diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/FrequentTenderersController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/FrequentTenderersController.java new file mode 100644 index 000000000..c56cbc3ca --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/FrequentTenderersController.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright (c) 2015 Development Gateway, Inc and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License (MIT) + * which accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + * + * Contributors: + * Development Gateway - initial API and implementation + *******************************************************************************/ +package org.devgateway.ocds.web.rest.controller; + +import static org.springframework.data.mongodb.core.query.Criteria.where; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import javax.validation.Valid; + +import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import io.swagger.annotations.ApiOperation; + +/** + * + * @author mpostelnicu + * + */ +@RestController +@CacheConfig(keyGenerator = "genericPagingRequestKeyGenerator", cacheNames = "genericPagingRequestJson") +@Cacheable +public class FrequentTenderersController extends GenericOCDSController { + + private class TendererPair { + private String tendererId1; + private String tendererId2; + + public String getTendererId1() { + return tendererId1; + } + + public void setTendererId1(String tenderer1) { + this.tendererId1 = tenderer1; + } + + public String getTendererId2() { + return tendererId2; + } + + public void setTendererId2(String tenderer2) { + this.tendererId2 = tenderer2; + } + + } + + private class ValueObject { + private TendererPair id; + private Integer value; + + public TendererPair getId() { + return id; + } + + public void setId(TendererPair id) { + this.id = id; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + } + + @ApiOperation(value = "Detect frequent pairs of tenderers that apply together to bids." + + "We are only showing pairs if they applied to more than one bid together." + + "We are sorting the results after the number of occurences, descending." + + "You can use all the filters that are available along with pagination options.") + @RequestMapping(value = "/api/frequentTenderers", method = { RequestMethod.POST, RequestMethod.GET }, + produces = "application/json") + public List frequentTenderers(@ModelAttribute @Valid final YearFilterPagingRequest filter) { + + return StreamSupport + .stream(mongoTemplate.mapReduce( + new Query(where("tender.tenderers.1").exists(true) + .andOperator(getYearDefaultFilterCriteria(filter, "tender.tenderPeriod.startDate"))), + "release", "classpath:frequent-tenderers-map.js", "classpath:frequent-tenderers-reduce.js", + ValueObject.class).spliterator(), false) + .filter(vo -> vo.getValue() > 1).sorted((p1, p2) -> p2.getValue().compareTo(p1.getValue())) + .skip(filter.getPageNumber() * filter.getPageSize()).limit(filter.getPageSize()) + .collect(Collectors.toList()); + } + +} \ No newline at end of file diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/GenericOCDSController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/GenericOCDSController.java index f53a290b4..fe4f3b1c8 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/GenericOCDSController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/GenericOCDSController.java @@ -74,6 +74,11 @@ protected Date getEndDate(final int year) { return end; } + protected String ref(String field) { + return "$" + field; + } + + /** * Appends the procuring bid type id for this filter, this will fitler based * on tender.items.classification._id @@ -85,6 +90,10 @@ protected Criteria getBidTypeIdFilterCriteria(final DefaultFilterPagingRequest f return createFilterCriteria("tender.items.classification._id", filter.getBidTypeId(), filter); } + protected Criteria getNotBidTypeIdFilterCriteria(final DefaultFilterPagingRequest filter) { + return createNotFilterCriteria("tender.items.classification._id", filter.getNotBidTypeId(), filter); + } + /** * Appends the tender.items.deliveryLocation._id @@ -112,15 +121,9 @@ private Criteria getByTenderAmountIntervalCriteria(final DefaultFilterPagingRequ } Criteria criteria = where("tender.value.amount"); if (filter.getMinTenderValue() != null) { - if (filter.getInvert()) { - criteria = criteria.not(); - } criteria = criteria.gte(filter.getMinTenderValue().doubleValue()); } if (filter.getMaxTenderValue() != null) { - if (filter.getInvert()) { - criteria = criteria.not(); - } criteria = criteria.lte(filter.getMaxTenderValue().doubleValue()); } return criteria; @@ -141,15 +144,9 @@ private Criteria getByAwardAmountIntervalCriteria(final DefaultFilterPagingReque } Criteria criteria = where("awards.value.amount"); if (filter.getMinAwardValue() != null) { - if (filter.getInvert()) { - criteria = criteria.not(); - } criteria = criteria.gte(filter.getMinAwardValue().doubleValue()); } if (filter.getMaxAwardValue() != null) { - if (filter.getInvert()) { - criteria = criteria.not(); - } criteria = criteria.lte(filter.getMaxAwardValue().doubleValue()); } return criteria; @@ -160,8 +157,15 @@ private Criteria createFilterCriteria(final String filterName, final List if (filterValues == null) { return new Criteria(); } - return filter.getInvert() ? where(filterName).not().in(filterValues.toArray()) - : where(filterName).in(filterValues.toArray()); + return where(filterName).in(filterValues.toArray()); + } + + private Criteria createNotFilterCriteria(final String filterName, final List filterValues, + final DefaultFilterPagingRequest filter) { + if (filterValues == null) { + return new Criteria(); + } + return where(filterName).not().in(filterValues.toArray()); } /** @@ -175,6 +179,11 @@ protected Criteria getProcuringEntityIdCriteria(final DefaultFilterPagingRequest return createFilterCriteria("tender.procuringEntity._id", filter.getProcuringEntityId(), filter); } + protected Criteria getNotProcuringEntityIdCriteria(final DefaultFilterPagingRequest filter) { + return createNotFilterCriteria("tender.procuringEntity._id", filter.getNotProcuringEntityId(), filter); + } + + /** * Appends the supplier entity id for this filter, this will fitler based @@ -215,22 +224,33 @@ protected Criteria getYearFilterCriteria(final YearFilterPagingRequest filter, f } } - return filter.getInvert() ? criteria.norOperator(yearCriteria) : criteria.orOperator(yearCriteria); + return criteria.orOperator(yearCriteria); } protected Criteria getDefaultFilterCriteria(final DefaultFilterPagingRequest filter) { - return new Criteria().andOperator(getBidTypeIdFilterCriteria(filter), getProcuringEntityIdCriteria(filter), + return new Criteria().andOperator( + getBidTypeIdFilterCriteria(filter), + getNotBidTypeIdFilterCriteria(filter), + getProcuringEntityIdCriteria(filter), + getNotProcuringEntityIdCriteria(filter), getSupplierIdCriteria(filter), - getByTenderDeliveryLocationIdentifier(filter), getByTenderAmountIntervalCriteria(filter), + getByTenderDeliveryLocationIdentifier(filter), + getByTenderAmountIntervalCriteria(filter), getByAwardAmountIntervalCriteria(filter)); } protected Criteria getYearDefaultFilterCriteria(final YearFilterPagingRequest filter, final String dateProperty) { - return new Criteria().andOperator(getBidTypeIdFilterCriteria(filter), getProcuringEntityIdCriteria(filter), + return new Criteria().andOperator( + getBidTypeIdFilterCriteria(filter), + getNotBidTypeIdFilterCriteria(filter), + getProcuringEntityIdCriteria(filter), + getNotProcuringEntityIdCriteria(filter), getSupplierIdCriteria(filter), - getByTenderDeliveryLocationIdentifier(filter), getByTenderAmountIntervalCriteria(filter), - getByAwardAmountIntervalCriteria(filter), getYearFilterCriteria(filter, dateProperty)); + getByTenderDeliveryLocationIdentifier(filter), + getByTenderAmountIntervalCriteria(filter), + getByAwardAmountIntervalCriteria(filter), + getYearFilterCriteria(filter, dateProperty)); } protected MatchOperation getMatchDefaultFilterOperation(final DefaultFilterPagingRequest filter) { diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/OcdsController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/OcdsController.java index 4dfe216d6..007e02359 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/OcdsController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/OcdsController.java @@ -11,11 +11,13 @@ *******************************************************************************/ package org.devgateway.ocds.web.rest.controller; +import com.fasterxml.jackson.annotation.JsonView; import io.swagger.annotations.ApiOperation; import org.devgateway.ocds.persistence.mongo.Publisher; import org.devgateway.ocds.persistence.mongo.Release; import org.devgateway.ocds.persistence.mongo.ReleasePackage; import org.devgateway.ocds.persistence.mongo.repository.ReleaseRepository; +import org.devgateway.ocds.persistence.mongo.spring.json.Views; import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; @@ -51,6 +53,7 @@ public class OcdsController extends GenericOCDSController { @RequestMapping(value = "/api/ocds/release/budgetProjectId/{projectId:^[a-zA-Z0-9]*$}", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public Release ocdsByProjectId(@PathVariable final String projectId) { Release release = releaseRepository.findByBudgetProjectId(projectId); @@ -61,6 +64,7 @@ public Release ocdsByProjectId(@PathVariable final String projectId) { @RequestMapping(value = "/api/ocds/release/ocid/{ocid}", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public Release ocdsByOcid(@PathVariable final String ocid) { Release release = releaseRepository.findByOcid(ocid); @@ -71,6 +75,7 @@ public Release ocdsByOcid(@PathVariable final String ocid) { + "This will contain the OCDS package information (metadata about publisher) plus the release itself.") @RequestMapping(value = "/api/ocds/package/ocid/{ocid}", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public ReleasePackage ocdsPackageByOcid(@PathVariable final String ocid) { Release release = releaseRepository.findByOcid(ocid); @@ -100,6 +105,7 @@ public ReleasePackage createReleasePackage(final Release release) { @RequestMapping(value = "/api/ocds/package/budgetProjectId/{projectId:^[a-zA-Z0-9]*$}", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public ReleasePackage packagedReleaseByProjectId(@PathVariable final String projectId) { Release release = ocdsByProjectId(projectId); @@ -114,6 +120,7 @@ public ReleasePackage packagedReleaseByProjectId(@PathVariable final String proj @ApiOperation(value = "Resturns all available releases, filtered by the given criteria.") @RequestMapping(value = "/api/ocds/release/all", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public List ocdsReleases(@ModelAttribute @Valid final YearFilterPagingRequest releaseRequest) { Pageable pageRequest = new PageRequest(releaseRequest.getPageNumber(), releaseRequest.getPageSize(), @@ -130,6 +137,7 @@ public List ocdsReleases(@ModelAttribute @Valid final YearFilterPagingR + "This will contain the OCDS package information (metadata about publisher) plus the release itself.") @RequestMapping(value = "/api/ocds/package/all", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @JsonView(Views.Public.class) public List ocdsPackages(@ModelAttribute @Valid final YearFilterPagingRequest releaseRequest) { List ocdsReleases = ocdsReleases(releaseRequest); List releasePackages = new ArrayList<>(ocdsReleases.size()); diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/TendersAwardsYears.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/TendersAwardsYears.java index 760dfef07..e037abe96 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/TendersAwardsYears.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/TendersAwardsYears.java @@ -28,7 +28,7 @@ import static org.springframework.data.mongodb.core.query.Criteria.where; /** - * @author mihai + * @author mpostelnicu * */ diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestController.java new file mode 100644 index 000000000..3faae1d78 --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestController.java @@ -0,0 +1,120 @@ +package org.devgateway.ocds.web.rest.controller; + +import javax.validation.Valid; + +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.ocds.persistence.repository.UserDashboardRepository; +import org.devgateway.toolkit.persistence.dao.Person; +import org.devgateway.toolkit.persistence.repository.PersonRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.data.rest.webmvc.PersistentEntityResourceAssembler; +import org.springframework.data.rest.webmvc.RepositoryRestController; +import org.springframework.data.web.PagedResourcesAssembler; +import org.springframework.hateoas.PagedResources; +import org.springframework.hateoas.Resource; +import org.springframework.hateoas.ResourceAssembler; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +@RepositoryRestController +public class UserDashboardRestController { + + private UserDashboardRepository repository; + + @Autowired + private PersonRepository personRepository; + + @Autowired + private PagedResourcesAssembler resourcesAssembler; + + + @Autowired + public UserDashboardRestController(UserDashboardRepository repo) { + repository = repo; + } + + @RequestMapping(method = { RequestMethod.POST, RequestMethod.GET }, + value = "/userDashboards/search/getDefaultDashboardForCurrentUser") + @PreAuthorize("hasRole('ROLE_PROCURING_ENTITY')") + @ResponseBody + public ResponseEntity + getDefaultDashboardForCurrentUser(PersistentEntityResourceAssembler persistentEntityResourceAssembler) { + UserDashboard dashboard = repository.getDefaultDashboardForPersonId(getCurrentAuthenticatedPerson().getId()); + if (dashboard == null) { + return ResponseEntity.ok().build(); + } + Resource resource = persistentEntityResourceAssembler.toResource(dashboard); + return ResponseEntity.ok(resource); + } + + @RequestMapping(method = { RequestMethod.POST, RequestMethod.GET }, + value = "/userDashboards/getCurrentAuthenticatedUserDetails") + @ResponseBody + public ResponseEntity + getCurrentAuthenticatedUserDetails(PersistentEntityResourceAssembler persistentEntityResourceAssembler) { + + Person currentAuthenticatedPersonToken = getCurrentAuthenticatedPerson(); + Person currentAuthenticatedPerson; + if (currentAuthenticatedPersonToken != null) { + currentAuthenticatedPerson = personRepository.getOne(currentAuthenticatedPersonToken.getId()); + } else { + return ResponseEntity.ok().build(); + } + + return ResponseEntity.ok(currentAuthenticatedPerson); + } + + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @RequestMapping(method = { RequestMethod.POST, RequestMethod.GET }, + value = "/userDashboards/search/getDashboardsForCurrentUser") + @PreAuthorize("hasRole('ROLE_PROCURING_ENTITY')") + @ResponseBody + public PagedResources> getDashboardsForCurrentUser(Pageable page, + PersistentEntityResourceAssembler persistentEntityResourceAssembler) { + return resourcesAssembler.toResource( + repository.findDashboardsForPersonId(getCurrentAuthenticatedPerson().getId(), page), + (ResourceAssembler) persistentEntityResourceAssembler); + } + + @RequestMapping(method = { RequestMethod.POST, RequestMethod.GET }, + value = "/userDashboards/saveDashboardForCurrentUser") + @PreAuthorize("hasRole('ROLE_PROCURING_ENTITY')") + public ResponseEntity saveDashboardForCurrentUser(@ModelAttribute @Valid UserDashboard userDashboard) { + Person person = personRepository.getOne(getCurrentAuthenticatedPerson().getId()); + userDashboard.getUsers().add(person); + person.getDashboards().add(userDashboard); + repository.save(userDashboard); + return ResponseEntity.ok().build(); + } + + @RequestMapping(method = { RequestMethod.POST, RequestMethod.GET }, value = "/userDashboards/saveDashboard") + @PreAuthorize("hasRole('ROLE_ADMIN')") + public ResponseEntity saveDashboard(@ModelAttribute @Valid UserDashboard userDashboard) { + repository.save(userDashboard); + return ResponseEntity.ok().build(); + } + + private static Person getCurrentAuthenticatedPerson() { + if (SecurityContextHolder.getContext().getAuthentication() == null) { + return null; + } + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null) { + return null; + } + final Object principal = authentication.getPrincipal(); + if (principal instanceof Person) { + return (Person) principal; + } + return null; + } + +} \ No newline at end of file diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagController.java new file mode 100644 index 000000000..ee0f4b53e --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagController.java @@ -0,0 +1,17 @@ +package org.devgateway.ocds.web.rest.controller.flags; + +import org.devgateway.ocds.web.rest.controller.GenericOCDSController; + +/** + * Created by mpostelnicu on 12/2/2016. + */ +public abstract class AbstractFlagController extends GenericOCDSController { + + protected abstract String getFlagProperty(); + + + protected String getYearProperty() { + return "tender.tenderPeriod.startDate"; + } + +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagReleaseSearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagReleaseSearchController.java new file mode 100644 index 000000000..ead0e3c42 --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagReleaseSearchController.java @@ -0,0 +1,29 @@ +package org.devgateway.ocds.web.rest.controller.flags; + +import com.fasterxml.jackson.annotation.JsonView; +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.spring.json.Views; +import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.web.bind.annotation.ModelAttribute; + +import javax.validation.Valid; +import java.util.List; + +/** + * Created by mpostelnicu on 12/2/2016. + */ +public abstract class AbstractFlagReleaseSearchController extends AbstractFlagController { + + + @JsonView(Views.Internal.class) + protected List releaseFlagSearch(@ModelAttribute @Valid final YearFilterPagingRequest filter) { + Query query = new Query(Criteria.where(getFlagProperty()).is(true). + andOperator(getYearDefaultFilterCriteria(filter, getYearProperty()))) + .with(new PageRequest(filter.getPageNumber(), filter.getPageSize())); + List results = mongoTemplate.find(query, FlaggedRelease.class); + return results; + } +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagStatsController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagStatsController.java new file mode 100644 index 000000000..46e709863 --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/AbstractFlagStatsController.java @@ -0,0 +1,95 @@ +package org.devgateway.ocds.web.rest.controller.flags; + +import com.mongodb.BasicDBObject; +import com.mongodb.DBObject; +import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; +import org.devgateway.toolkit.persistence.mongo.aggregate.CustomGroupingOperation; +import org.devgateway.toolkit.persistence.mongo.aggregate.CustomProjectionOperation; +import org.springframework.data.mongodb.core.aggregation.Aggregation; +import org.springframework.data.mongodb.core.aggregation.AggregationResults; +import org.springframework.data.mongodb.core.aggregation.Fields; +import org.springframework.web.bind.annotation.ModelAttribute; + +import javax.validation.Valid; +import java.util.Arrays; +import java.util.List; + +import static org.springframework.data.mongodb.core.aggregation.Aggregation.match; +import static org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation; + +/** + * Created by mpostelnicu on 12/2/2016. + */ +public abstract class AbstractFlagStatsController extends AbstractFlagController { + + public static final class GenericKeys { + public static final String TOTAL = "total"; + public static final String TOTAL_TRUE = "totalTrue"; + public static final String TOTAL_FALSE = "totalFalse"; + public static final String TOTAL_PRECOND_MET = "totalPrecondMet"; + public static final String PERCENT_TRUE_PRECOND_MET = "percentTruePrecondMet"; + public static final String PERCENT_FALSE_PRECOND_MET = "percentFalsePrecondMet"; + public static final String PERCENT_PRECOND_MET = "percentPrecondMet"; + } + + + protected DBObject getProjectPrepare(final YearFilterPagingRequest year) { + DBObject projectPrepare = new BasicDBObject(); + projectPrepare.put(getFlagProperty(), 1); + return projectPrepare; + } + + + protected DBObject getGroup(final YearFilterPagingRequest filter) { + DBObject group = new BasicDBObject(); + group.put(Fields.UNDERSCORE_ID, null); + group.put(GenericKeys.TOTAL, new BasicDBObject("$sum", 1)); + group.put(GenericKeys.TOTAL_TRUE, new BasicDBObject("$sum", new BasicDBObject("$cond", + Arrays.asList(new BasicDBObject("$eq", Arrays.asList(ref(getFlagProperty()), true)), 1, 0)))); + group.put(GenericKeys.TOTAL_FALSE, new BasicDBObject("$sum", new BasicDBObject("$cond", + Arrays.asList(new BasicDBObject("$eq", Arrays.asList(ref(getFlagProperty()), false)), 1, 0)))); + group.put(GenericKeys.TOTAL_PRECOND_MET, new BasicDBObject("$sum", new BasicDBObject("$cond", + Arrays.asList(new BasicDBObject("$gt", Arrays.asList(ref(getFlagProperty()), null)), 1, 0)))); + return group; + } + + protected DBObject getProjectPercentage(final YearFilterPagingRequest filter) { + DBObject project2 = new BasicDBObject(); + project2.put(Fields.UNDERSCORE_ID, 0); + project2.put(GenericKeys.TOTAL, 1); + project2.put(GenericKeys.TOTAL_TRUE, 1); + project2.put(GenericKeys.TOTAL_FALSE, 1); + project2.put(GenericKeys.TOTAL_PRECOND_MET, 1); + project2.put(GenericKeys.PERCENT_TRUE_PRECOND_MET, new BasicDBObject("$multiply", + Arrays.asList(new BasicDBObject("$divide", Arrays.asList(ref(GenericKeys.TOTAL_TRUE), + ref(GenericKeys.TOTAL_PRECOND_MET))), 100))); + project2.put(GenericKeys.PERCENT_FALSE_PRECOND_MET, new BasicDBObject("$multiply", + Arrays.asList(new BasicDBObject("$divide", Arrays.asList(ref(GenericKeys.TOTAL_FALSE), + ref(GenericKeys.TOTAL_PRECOND_MET))), 100))); + project2.put(GenericKeys.PERCENT_PRECOND_MET, new BasicDBObject("$multiply", + Arrays.asList(new BasicDBObject("$divide", Arrays.asList(ref(GenericKeys.TOTAL_PRECOND_MET), + ref(GenericKeys.TOTAL))), 100))); + return project2; + } + + protected List flagStats(@ModelAttribute @Valid final YearFilterPagingRequest filter) { + + + DBObject projectPrepare = getProjectPrepare(filter); + + DBObject group = getGroup(filter); + + DBObject projectPercentage = getProjectPercentage(filter); + + Aggregation agg = newAggregation( + match(getYearDefaultFilterCriteria(filter, getYearProperty())), + new CustomProjectionOperation(projectPrepare), + new CustomGroupingOperation(group), + new CustomProjectionOperation(projectPercentage) + ); + + AggregationResults results = mongoTemplate.aggregate(agg, "release", DBObject.class); + List list = results.getMappedResults(); + return list; + } +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038ReleaseSearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038ReleaseSearchController.java new file mode 100644 index 000000000..5019ca796 --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038ReleaseSearchController.java @@ -0,0 +1,36 @@ +package org.devgateway.ocds.web.rest.controller.flags; + +import io.swagger.annotations.ApiOperation; +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.flags.FlagsConstants; +import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * Created by mpostelnicu on 12/2/2016. + */ +@RestController +@CacheConfig(keyGenerator = "genericPagingRequestKeyGenerator", cacheNames = "genericPagingRequestJson") +@Cacheable +public class FlagI038ReleaseSearchController extends AbstractFlagReleaseSearchController { + @Override + protected String getFlagProperty() { + return FlagsConstants.I038_VALUE; + } + + @Override + @ApiOperation(value = "Search releases by flag i038") + @RequestMapping(value = "/api/flags/i038/releases", + method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + protected List releaseFlagSearch(@ModelAttribute @Valid YearFilterPagingRequest filter) { + return super.releaseFlagSearch(filter); + } +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038StatsController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038StatsController.java new file mode 100644 index 000000000..c3548e071 --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/flags/FlagI038StatsController.java @@ -0,0 +1,37 @@ +package org.devgateway.ocds.web.rest.controller.flags; + +import com.mongodb.DBObject; +import io.swagger.annotations.ApiOperation; +import org.devgateway.ocds.persistence.mongo.flags.FlagsConstants; +import org.devgateway.ocds.web.rest.controller.request.YearFilterPagingRequest; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * Created by mpostelnicu on 12/2/2016. + */ +@RestController +@CacheConfig(keyGenerator = "genericPagingRequestKeyGenerator", cacheNames = "genericPagingRequestJson") +@Cacheable +public class FlagI038StatsController extends AbstractFlagStatsController { + + @Override + protected String getFlagProperty() { + return FlagsConstants.I038_VALUE; + } + + @Override + @ApiOperation(value = "Stats for flag i038") + @RequestMapping(value = "/api/flags/i038/stats", + method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + protected List flagStats(@ModelAttribute @Valid YearFilterPagingRequest filter) { + return super.flagStats(filter); + } +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/DefaultFilterPagingRequest.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/DefaultFilterPagingRequest.java index d85872ea9..45f42edf2 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/DefaultFilterPagingRequest.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/DefaultFilterPagingRequest.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty; /** - * @author mihai Filtering bean applied to all endpoints + * @author mpostelnicu Filtering bean applied to all endpoints */ public class DefaultFilterPagingRequest extends GenericPagingRequest { @@ -18,12 +18,22 @@ public class DefaultFilterPagingRequest extends GenericPagingRequest { @ApiModelProperty(value = "This corresponds to the tender.items.classification._id") private List bidTypeId; + @EachPattern(regexp = "^[a-zA-Z0-9]*$") + @ApiModelProperty( + value = "This corresponds the negated bidTypeId filter, matches elements that are NOT in the list of Ids") + private List notBidTypeId; + @EachPattern(regexp = "^[a-zA-Z0-9]*$") @ApiModelProperty(value = "This is the id of the organization/procuring entity. " + "Corresponds to the OCDS Organization.identifier") private List procuringEntityId; - //@EachPattern(regexp = "^[\\p{L}0-9]*$") + @EachPattern(regexp = "^[a-zA-Z0-9]*$") + @ApiModelProperty(value = "This corresponds the negated procuringEntityId filter," + + " matches elements that are NOT in the list of Ids") + private List notProcuringEntityId; + + // @EachPattern(regexp = "^[\\p{L}0-9]*$") @ApiModelProperty(value = "This is the id of the organization/supplier entity. " + "Corresponds to the OCDS Organization.identifier") private List supplierId; @@ -47,20 +57,6 @@ public class DefaultFilterPagingRequest extends GenericPagingRequest { + "Use /api/awardValueInterval to get the maximum allowed.") private BigDecimal maxAwardValue; - /** - * This parameter will invert (negate) all existing filtering parameters. So - * A IN B turns into A NOT IN B. A IN B AND AN IN C turns into A NOT IN B - * AND A NOT IN C. So this is NOT exactly a logical *not*, the correct way - * would be !(A && B) = !A || !B. Which is not what we do here, but we - * actually dont use multiple parameters anywhere, so it should not matter - * now - */ - @ApiModelProperty(value = "This parameter will invert (negate) all existing filtering parameters." - + "So A IN B turns into A NOT IN B. A IN B AND AN IN C turns into A NOT IN B" - + " AND A NOT IN C. So this is NOT exactly a logical *not*, the correct way " - + " would be !(A && B) = !A || !B.") - private Boolean invert = false; - public DefaultFilterPagingRequest() { super(); } @@ -81,16 +77,6 @@ public void setProcuringEntityId(final List procuringEntityId) { this.procuringEntityId = procuringEntityId; } - - - public Boolean getInvert() { - return invert; - } - - public void setInvert(final Boolean invert) { - this.invert = invert; - } - public List getTenderLoc() { return tenderLoc; } @@ -139,6 +125,20 @@ public void setSupplierId(final List supplierId) { this.supplierId = supplierId; } + public List getNotBidTypeId() { + return notBidTypeId; + } + + public void setNotBidTypeId(List notBidTypeId) { + this.notBidTypeId = notBidTypeId; + } + + public List getNotProcuringEntityId() { + return notProcuringEntityId; + } + public void setNotProcuringEntityId(List notProcuringEntityId) { + this.notProcuringEntityId = notProcuringEntityId; + } } diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/GenericPagingRequest.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/GenericPagingRequest.java index 785879d46..3b49a91d8 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/GenericPagingRequest.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/GenericPagingRequest.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty; /** - * @author mihai + * @author mpostelnicu * */ public class GenericPagingRequest { diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationIdWrapper.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationIdWrapper.java new file mode 100644 index 000000000..e86a1e6be --- /dev/null +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationIdWrapper.java @@ -0,0 +1,22 @@ +package org.devgateway.ocds.web.rest.controller.request; + +import java.util.List; + +import cz.jirutka.validator.collection.constraints.EachPattern; +import io.swagger.annotations.ApiModelProperty; + +public class OrganizationIdWrapper { + + @EachPattern(regexp = "^[a-zA-Z0-9]*$") + @ApiModelProperty(value = "List of organization identifiers") + private List id; + + public List getId() { + return id; + } + + public void setId(List ids) { + this.id = ids; + } + +} diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationSearchRequest.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationSearchRequest.java index b4811a89b..35ce238cd 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationSearchRequest.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/OrganizationSearchRequest.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; /** - * @author mihai + * @author mpostelnicu * */ public class OrganizationSearchRequest extends GenericPagingRequest { diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/TextSearchRequest.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/TextSearchRequest.java index bb9dc79e7..92baa6dfe 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/TextSearchRequest.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/request/TextSearchRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.Size; /** - * @author mihai + * @author mpostelnicu * */ public class TextSearchRequest extends GenericPagingRequest { diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/BuyerSearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/BuyerSearchController.java index ce0cc4593..3f92ddf1b 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/BuyerSearchController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/BuyerSearchController.java @@ -27,7 +27,7 @@ public class BuyerSearchController extends AbstractOrganizationSearchController method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") @ApiOperation(value = "Finds buyer entity by the given id") public Organization byId(@PathVariable final String id) { - return organizationRepository.findByIdAndTypes(id, Organization.OrganizationType.buyer); + return organizationRepository.findByAllIdsAndType(id, Organization.OrganizationType.buyer); } /** diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/OrganizationSearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/OrganizationSearchController.java index 21e12d5f0..2346a17e2 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/OrganizationSearchController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/OrganizationSearchController.java @@ -5,7 +5,9 @@ import javax.validation.Valid; import org.devgateway.ocds.persistence.mongo.Organization; +import org.devgateway.ocds.web.rest.controller.request.OrganizationIdWrapper; import org.devgateway.ocds.web.rest.controller.request.OrganizationSearchRequest; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -34,6 +36,13 @@ public class OrganizationSearchController extends AbstractOrganizationSearchCont public Organization byId(@PathVariable final String id) { return organizationRepository.findOne(id); } + + @RequestMapping(value = "/api/ocds/organization/ids", + method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") + @ApiOperation(value = "Finds organization entities by the given list of ids, comma separated") + public List byIdCollection(@ModelAttribute @Valid OrganizationIdWrapper orgIdWrapper) { + return organizationRepository.findByIdCollection(orgIdWrapper.getId()); + } @RequestMapping(value = "/api/ocds/organization/all", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/ProcuringEntitySearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/ProcuringEntitySearchController.java index 007683e99..da2082279 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/ProcuringEntitySearchController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/ProcuringEntitySearchController.java @@ -27,7 +27,7 @@ public class ProcuringEntitySearchController extends AbstractOrganizationSearchC method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") @ApiOperation(value = "Finds procuringEntities by the given id") public Organization byId(@PathVariable final String id) { - return organizationRepository.findByIdAndTypes(id, Organization.OrganizationType.procuringEntity); + return organizationRepository.findByAllIdsAndType(id, Organization.OrganizationType.procuringEntity); } /** diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/SupplierSearchController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/SupplierSearchController.java index a610cdd89..24492129f 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/SupplierSearchController.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/SupplierSearchController.java @@ -26,7 +26,7 @@ public class SupplierSearchController extends AbstractOrganizationSearchControll method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json") @ApiOperation(value = "Finds supplier by the given id") public Organization byId(@PathVariable final String id) { - return organizationRepository.findByIdAndTypes(id, Organization.OrganizationType.supplier); + return organizationRepository.findByAllIdsAndType(id, Organization.OrganizationType.supplier); } /** diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/TendersAwardsValueIntervals.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/TendersAwardsValueIntervals.java index e24763782..64446bfd0 100644 --- a/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/TendersAwardsValueIntervals.java +++ b/web/src/main/java/org/devgateway/ocds/web/rest/controller/selector/TendersAwardsValueIntervals.java @@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation; /** - * @author mihai + * @author mpostelnicu * */ @RestController diff --git a/web/src/main/java/org/devgateway/toolkit/web/application.properties b/web/src/main/java/org/devgateway/toolkit/web/application.properties index 715f08e3c..0a6805e7a 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/application.properties +++ b/web/src/main/java/org/devgateway/toolkit/web/application.properties @@ -22,4 +22,4 @@ spring.profiles.active=default # Hierarchy is specified as a string. Space separates rules and > symbol has the meaning of 'includes'. # Example: role1 > role2 > role3 role2 > role4 # Here role1 includes role2 role3 and role4 (indirectly). And role2 includes role4. -roleHierarchy=ROLE_ADMIN > ROLE_USER +roleHierarchy=ROLE_ADMIN > ROLE_PROCURING_ENTITY > ROLE_USER diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/AsyncControllerLookupService.java b/web/src/main/java/org/devgateway/toolkit/web/spring/AsyncControllerLookupService.java index 3fac74ae8..138ecd339 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/spring/AsyncControllerLookupService.java +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/AsyncControllerLookupService.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; /** - * @author mihai Service designed to run a + * @author mpostelnicu Service designed to run a * {@link AsyncBeanParamControllerMethodCallable} using a {@link Object} * as its parameter. and return the results in an {@link Async} way. */ diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/CustomRestMvcConfiguration.java b/web/src/main/java/org/devgateway/toolkit/web/spring/CustomRestMvcConfiguration.java new file mode 100644 index 000000000..1da9c5642 --- /dev/null +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/CustomRestMvcConfiguration.java @@ -0,0 +1,32 @@ +package org.devgateway.toolkit.web.spring; + +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.rest.core.config.RepositoryRestConfiguration; +import org.springframework.data.rest.core.mapping.RepositoryDetectionStrategy.RepositoryDetectionStrategies; +import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer; +import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter; + +/** + * We only allow to expose repositories that are annotated + * + * @author mpostelnicu + * http://docs.spring.io/spring-data/rest/docs/current/reference/html/#_which_repositories_get_exposed_by_defaults + */ +@Configuration +public class CustomRestMvcConfiguration { + + @Bean + public RepositoryRestConfigurer repositoryRestConfigurer() { + + return new RepositoryRestConfigurerAdapter() { + + @Override + public void configureRepositoryRestConfiguration(final RepositoryRestConfiguration config) { + config.setRepositoryDetectionStrategy(RepositoryDetectionStrategies.ANNOTATED); + config.exposeIdsFor(UserDashboard.class); + } + }; + } +} \ No newline at end of file diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/MvcConfig.java b/web/src/main/java/org/devgateway/toolkit/web/spring/MvcConfig.java index ba737085b..fd48cbd70 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/spring/MvcConfig.java +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/MvcConfig.java @@ -11,9 +11,9 @@ *******************************************************************************/ package org.devgateway.toolkit.web.spring; -import java.text.SimpleDateFormat; -import java.util.TimeZone; - +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.io.FileCleaningTracker; import org.bson.types.ObjectId; import org.devgateway.ocds.web.cache.generators.GenericExcelChartKeyGenerator; @@ -27,9 +27,8 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import java.text.SimpleDateFormat; +import java.util.TimeZone; @Configuration public class MvcConfig extends WebMvcConfigurerAdapter { @@ -49,6 +48,7 @@ public Jackson2ObjectMapperBuilder objectMapperBuilder() { builder.serializationInclusion(Include.NON_EMPTY).dateFormat(dateFormatGmt); builder.serializerByType(GeoJsonPoint.class, new GeoJsonPointSerializer()); builder.serializerByType(ObjectId.class, new ToStringSerializer()); + builder.defaultViewInclusion(true); return builder; } diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java b/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java index b803caa15..0a5130227 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java @@ -22,6 +22,7 @@ import org.springframework.security.access.hierarchicalroles.RoleHierarchy; import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -43,6 +44,7 @@ @Order(2) // this loads the security config after the forms security (if you use // them overlayed, it must pick that one first) @EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) @PropertySource("classpath:allowedApiEndpoints.properties") public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @@ -75,11 +77,14 @@ public void configure(final WebSecurity web) throws Exception { } + @Override protected void configure(final HttpSecurity http) throws Exception { http.authorizeRequests() .expressionHandler(webExpressionHandler()) // inject role hierarchy - .anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll().and() + .anyRequest().authenticated().and().formLogin(). + loginPage("/login"). + permitAll().and().requestCache().and() .logout().permitAll().and().sessionManagement().and().csrf().disable(); http.addFilter(securityContextPersistenceFilter()); } diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/util/AsyncBeanParamControllerMethodCallable.java b/web/src/main/java/org/devgateway/toolkit/web/spring/util/AsyncBeanParamControllerMethodCallable.java index 54a5d3107..fcc7adbfe 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/spring/util/AsyncBeanParamControllerMethodCallable.java +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/util/AsyncBeanParamControllerMethodCallable.java @@ -4,7 +4,7 @@ /** * @see AsyncControllerLookupService - * @author mihai + * @author mpostelnicu * * @param * @param diff --git a/web/src/main/resources/allowedApiEndpoints.properties b/web/src/main/resources/allowedApiEndpoints.properties index c9e03ae8d..2ab0cc540 100644 --- a/web/src/main/resources/allowedApiEndpoints.properties +++ b/web/src/main/resources/allowedApiEndpoints.properties @@ -56,4 +56,7 @@ allowedApiEndpoints=/api/tenderPriceByProcurementMethod**,\ /api/numberOfTendersByItemClassification**,\ /api/totalCancelledTendersByYearByRationale**,\ /api/costEffectivenessTenderAwardAmount**,\ -/api/tendersAwardsYears** \ No newline at end of file +/api/tendersAwardsYears**,\ +/rest/userDashboards/getCurrentAuthenticatedUserDetails,\ +/api/frequentTenderers**,\ +/api/ocds/organization/ids** \ No newline at end of file diff --git a/web/src/test/java/org/devgateway/ocds/web/rest/controller/OrganizationEndpointsTest.java b/web/src/test/java/org/devgateway/ocds/web/rest/controller/OrganizationEndpointsTest.java index 40d238f1a..db37c3381 100644 --- a/web/src/test/java/org/devgateway/ocds/web/rest/controller/OrganizationEndpointsTest.java +++ b/web/src/test/java/org/devgateway/ocds/web/rest/controller/OrganizationEndpointsTest.java @@ -62,6 +62,7 @@ public void importTestData() throws IOException, InterruptedException { organization.setContactPoint(contactPoint); final Identifier identifier = new Identifier(); + identifier.setId(ORG_ID); organization.getAdditionalIdentifiers().add(identifier); organization.getTypes().add(Organization.OrganizationType.procuringEntity); organization.getTypes().add(Organization.OrganizationType.buyer); diff --git a/web/src/test/java/org/devgateway/ocds/web/rest/controller/ReleaseFlaggingServiceTest.java b/web/src/test/java/org/devgateway/ocds/web/rest/controller/ReleaseFlaggingServiceTest.java new file mode 100644 index 000000000..8d41da4b1 --- /dev/null +++ b/web/src/test/java/org/devgateway/ocds/web/rest/controller/ReleaseFlaggingServiceTest.java @@ -0,0 +1,45 @@ +/** + * + */ +package org.devgateway.ocds.web.rest.controller; + +import org.devgateway.ocds.persistence.mongo.FlaggedRelease; +import org.devgateway.ocds.persistence.mongo.repository.FlaggedReleaseRepository; +import org.devgateway.ocds.persistence.mongo.spring.ReleaseFlaggingService; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @author mpostelnicu + * + */ +public class ReleaseFlaggingServiceTest extends AbstractEndPointControllerTest { + + @Autowired + private ReleaseFlaggingService releaseFlaggingService; + + + @Autowired + private FlaggedReleaseRepository flaggedReleaseRepository;; + + + public static void logMessage(String message) { + logger.info(message); + } + + @Test + public void testProcessAndSaveFlagsForAllReleases() { + releaseFlaggingService.processAndSaveFlagsForAllReleases(ReleaseFlaggingServiceTest::logMessage); + + FlaggedRelease release1 = flaggedReleaseRepository.findByOcid("ocds-endpoint-001"); + Assert.assertNotNull(release1); + Assert.assertEquals(false, release1.getFlags().getI038().getValue()); + + FlaggedRelease release2 = flaggedReleaseRepository.findByOcid("ocds-endpoint-002"); + Assert.assertNotNull(release2); + Assert.assertEquals(null, release2.getFlags().getI038().getValue()); + + } + +} diff --git a/web/src/test/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestControllerTest.java b/web/src/test/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestControllerTest.java new file mode 100644 index 000000000..4433ae0a9 --- /dev/null +++ b/web/src/test/java/org/devgateway/ocds/web/rest/controller/UserDashboardRestControllerTest.java @@ -0,0 +1,48 @@ +package org.devgateway.ocds.web.rest.controller; + +import org.devgateway.ocds.persistence.dao.UserDashboard; +import org.devgateway.toolkit.web.AbstractSpringDataRestControllerTest; +import org.devgateway.toolkit.web.TestUserDetailsConfiguration; +import org.devgateway.toolkit.web.spring.CustomRestMvcConfiguration; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.hateoas.PagedResources; +import org.springframework.hateoas.Resource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.test.context.support.WithUserDetails; +import org.springframework.test.context.ContextConfiguration; + +@ContextConfiguration(classes = { CustomRestMvcConfiguration.class, TestUserDetailsConfiguration.class }) +public class UserDashboardRestControllerTest extends AbstractSpringDataRestControllerTest { + + @Autowired + private UserDashboardRestController userDashboardRestController; + + @Test + @WithUserDetails(value = "admin", userDetailsServiceBeanName = "testUserDetailsAdminProcuringEntity") + public void saveDashboardForCurrentUser() { + + UserDashboard ud = new UserDashboard(); + ud.setName("some name"); + ud.setFormUrlEncodedBody("some body"); + ResponseEntity responseEntity = userDashboardRestController.saveDashboardForCurrentUser(ud); + Assert.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + } + + @Test + @WithUserDetails(value = "admin", userDetailsServiceBeanName = "testUserDetailsAdminProcuringEntity") + public void getDefaultDashboardForCurrentUserTest() { + ResponseEntity responseEntity = + userDashboardRestController.getDefaultDashboardForCurrentUser(persistentEntityResourceAssembler); + Assert.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + } + + @Test + @WithUserDetails(value = "admin", userDetailsServiceBeanName = "testUserDetailsAdminProcuringEntity") + public void getDefaultDashboardsForCurrentUserTest() { + PagedResources> responseEntity = + userDashboardRestController.getDashboardsForCurrentUser(pageRequest, persistentEntityResourceAssembler); + } +} diff --git a/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java b/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java new file mode 100644 index 000000000..f63bb4d4b --- /dev/null +++ b/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java @@ -0,0 +1,69 @@ +/** + * + */ +package org.devgateway.toolkit.web; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Collections; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.junit.Before; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.rest.webmvc.PersistentEntityResourceAssembler; +import org.springframework.data.web.PagedResourcesAssembler; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +/** + * @author mpostelnicuThis helps us test Spring Data Rest + * repositories with our infrastructure. + */ +@Transactional +public abstract class AbstractSpringDataRestControllerTest extends AbstractWebTest { + + protected PersistentEntityResourceAssembler persistentEntityResourceAssembler; + + protected PageRequest pageRequest; + + @Autowired + protected WebApplicationContext context; + + protected MockMvc mockMvc; + + /** + * http://stackoverflow.com/a/36960968 + * This is needed if you do + * {@link PagedResourcesAssembler#toResource(org.springframework.data.domain.Page)} + * in your controller + */ + private void mockHttpServletRequestForResouceAssemblerSupport() { + String localHost = "http://localhost"; + HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class); + when(httpServletRequestMock.getRequestURL()).thenReturn(new StringBuffer(localHost)); + when(httpServletRequestMock.getHeaderNames()).thenReturn(Collections.emptyEnumeration()); + when(httpServletRequestMock.getRequestURI()).thenReturn(localHost); + when(httpServletRequestMock.getContextPath()).thenReturn(StringUtils.EMPTY); + when(httpServletRequestMock.getServletPath()).thenReturn(StringUtils.EMPTY); + ServletRequestAttributes servletRequestAttributes = new ServletRequestAttributes(httpServletRequestMock); + RequestContextHolder.setRequestAttributes(servletRequestAttributes); + } + + @Before + public void setUp() { + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + this.persistentEntityResourceAssembler = mock(PersistentEntityResourceAssembler.class); + this.pageRequest = mock(PageRequest.class); + + mockHttpServletRequestForResouceAssemblerSupport(); + } + +} diff --git a/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java b/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java index ec67fe2e0..65ef8399c 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** - * @author mihai + * @author mpostelnicu * */ public class AsyncControllerLookupServiceTest extends AbstractWebTest { diff --git a/web/src/test/java/org/devgateway/toolkit/web/TestUserDetailsConfiguration.java b/web/src/test/java/org/devgateway/toolkit/web/TestUserDetailsConfiguration.java new file mode 100644 index 000000000..42439e2d2 --- /dev/null +++ b/web/src/test/java/org/devgateway/toolkit/web/TestUserDetailsConfiguration.java @@ -0,0 +1,47 @@ +package org.devgateway.toolkit.web; + +import java.util.Arrays; + +import org.devgateway.toolkit.persistence.dao.Person; +import org.devgateway.toolkit.persistence.repository.PersonRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +/** + * Stub {@link UserDetailsService} used for testing purposes. Not to be used on + * anything else! + * + * @author mpostelnicu + * + */ +@Profile("integration") +@Configuration +public class TestUserDetailsConfiguration { + + @Autowired + private PersonRepository personRepository; + + @Bean("testUserDetailsAdminProcuringEntity") + public UserDetailsService testUserDetailsAdminProcuringEntity() { + + return new UserDetailsService() { + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + Person person = new Person(); + person.setUsername(username); + person.setPassword("idontcare"); + person.setAuthorities(Arrays.asList(new SimpleGrantedAuthority("ROLE_PROCURING_ENTITY"), + new SimpleGrantedAuthority("ROLE_ADMIN"))); + return personRepository.save(person); + } + }; + } + +} \ No newline at end of file diff --git a/web/src/test/resources/test.properties b/web/src/test/resources/test.properties index b37905f98..07e7e002c 100644 --- a/web/src/test/resources/test.properties +++ b/web/src/test/resources/test.properties @@ -1,5 +1,5 @@ spring.data.mongodb.port=27018 -spring.mongodb.embedded.version=3.2.9 +spring.mongodb.embedded.version=3.2.10 # liquibase properties liquibase.enabled=false
{this.__("Number")}{this.__("Start date")}{this.__("End date")}{this.__("Procuring entity")}{this.__("Estimated value")}{this.t('tables:top10tenders:number')}{this.t('tables:top10tenders:startDate')}{this.t('tables:top10tenders:endDate')}{this.t('tables:top10tenders:procuringEntity')}{this.t('tables:top10tenders:estimatedValue')}