This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f8d68757057fefe60a1e37f6a5799005ae567879 Merge: 8f26b55 4a0c343 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Mon May 27 12:16:47 2019 +0300 Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects .../dlab/backendapi/SelfServiceApplication.java | 2 +- .../epam/dlab/backendapi/annotation/Project.java | 12 +++++ .../epam/dlab/backendapi/dao/BaseBillingDAO.java | 18 ++++++++ .../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 4 +- .../com/epam/dlab/backendapi/dao/BillingDAO.java | 4 ++ .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 30 +++++++++++++ .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 7 +++ .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 16 +++++++ .../dlab/backendapi/dao/gcp/GcpBillingDao.java | 10 +++++ .../epam/dlab/backendapi/domain/EndpointDTO.java | 2 + .../epam/dlab/backendapi/domain/ProjectDTO.java | 7 ++- .../backendapi/domain/UpdateProjectBudgetDTO.java | 13 ++++++ .../interceptor/BudgetLimitInterceptor.java | 17 ++++++- .../backendapi/resources/EndpointResource.java | 4 +- .../backendapi/resources/ExploratoryResource.java | 4 +- .../dlab/backendapi/resources/ProjectResource.java | 35 +++++++++++++++ .../schedulers/CheckProjectQuoteScheduler.java | 52 ++++++++++++++++++++++ .../backendapi/service/ComputationalService.java | 6 +-- .../backendapi/service/EnvironmentService.java | 2 + .../backendapi/service/ExploratoryService.java | 4 +- .../dlab/backendapi/service/ProjectService.java | 6 +++ .../service/impl/ComputationalServiceImpl.java | 8 ++-- .../service/impl/EnvironmentServiceImpl.java | 29 ++++++++++++ .../service/impl/ExploratoryServiceImpl.java | 5 ++- .../service/impl/ProjectServiceImpl.java | 17 ++++++- .../service/impl/SchedulerJobServiceImpl.java | 4 +- .../resources/ExploratoryResourceTest.java | 14 +++--- .../service/impl/ComputationalServiceImplTest.java | 20 ++++----- .../service/impl/ExploratoryServiceImplTest.java | 12 ++--- .../service/impl/SchedulerJobServiceImplTest.java | 12 ++--- 30 files changed, 325 insertions(+), 51 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
