Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ad20793
Create and Populate Tables
TaylorB-softdevkainos Aug 15, 2024
d37dfae
Merge pull request #1 from TaylorB-softdevkainos/001-create-populate-…
niall-mccloy Aug 15, 2024
fad7f03
adding get sales employees
niall-mccloy Aug 15, 2024
7f89ef4
adding get all sales employees
niall-mccloy Aug 15, 2024
42d85e5
List all clients projects
jxryyy Aug 15, 2024
ff68580
renmaing models to singular
niall-mccloy Aug 15, 2024
ad28143
Merge pull request #2 from TaylorB-softdevkainos/002-get-sales-employees
niall-mccloy Aug 15, 2024
bb81576
Merge branch 'main' into 003-get-all-clients
jericoatos Aug 15, 2024
b37ac3e
Merge pull request #3 from TaylorB-softdevkainos/003-get-all-clients
jericoatos Aug 15, 2024
465af20
adding get delivery employees
niall-mccloy Aug 15, 2024
268042a
Merge pull request #4 from TaylorB-softdevkainos/004-get-all-delivery
connmor2003 Aug 15, 2024
642d636
Add get highest value project
jxryyy Aug 15, 2024
0e8bb32
Update ProjectController.java
jericoatos Aug 15, 2024
dbdfd79
Update ProjectService.java
jericoatos Aug 15, 2024
6bbedeb
Update ProjectDao.java
jericoatos Aug 15, 2024
4860ef3
Merge pull request #5 from TaylorB-softdevkainos/005-get-highest-valu…
jericoatos Aug 15, 2024
2f0e537
fixed prepared statement in ProjectDao
Aug 15, 2024
355d861
Merge pull request #6 from TaylorB-softdevkainos/009-emergency-fix-pr…
connmor2003 Aug 15, 2024
28d13c7
adding get delivery employee by id
niall-mccloy Aug 15, 2024
0a1a552
adding sales by id
niall-mccloy Aug 15, 2024
90259ff
Merge pull request #7 from TaylorB-softdevkainos/006-get-sales-by-id
connmor2003 Aug 15, 2024
23291e0
Add Role Table
TaylorB-softdevkainos Aug 15, 2024
c831ac4
Merge pull request #8 from TaylorB-softdevkainos/006-fix-testapp
TaylorB-softdevkainos Aug 15, 2024
803ae28
adding get delivery employee by id
niall-mccloy Aug 15, 2024
21a7f7e
fixing linter errors
niall-mccloy Aug 15, 2024
d98723a
adding slahses to end points
niall-mccloy Aug 15, 2024
1efda4d
Merge pull request #9 from TaylorB-softdevkainos/008-adding-get-deliv…
TaylorB-softdevkainos Aug 15, 2024
5e5125a
Added create project
jxryyy Aug 15, 2024
17bdb0e
Fixed validation
jxryyy Aug 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 39 additions & 9 deletions src/main/java/org/example/TestApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,63 @@
import io.dropwizard.setup.Environment;
import io.federecio.dropwizard.swagger.SwaggerBundle;
import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;

import org.example.controllers.ClientController;
import org.example.controllers.ProjectController;
import org.example.controllers.TestController;
import org.example.daos.ClientDao;
import org.example.daos.ProjectDao;
import org.example.daos.TestDao;
import org.example.services.ClientService;

import org.example.controllers.EmployeeController;
import org.example.daos.EmployeeDao;
import org.example.services.EmployeeService;

import org.example.services.ProjectService;
import org.example.services.TestService;
import org.example.validators.ProjectValidator;

public class TestApplication extends Application<TestConfiguration> {

public class TestApplication
extends Application<TestConfiguration> {
public static void main(final String[] args) throws Exception {
new TestApplication().run(args);
}
@Override
public String getName() {
return "Test";
return "Git and Run";
}

@Override
public void initialize(final Bootstrap<TestConfiguration> bootstrap) {
bootstrap.addBundle(new SwaggerBundle<>() {
@Override
protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(
final TestConfiguration configuration) {
return configuration.getSwagger();
bootstrap.addBundle(
new SwaggerBundle<TestConfiguration>() {
@Override
protected SwaggerBundleConfiguration
getSwaggerBundleConfiguration(
final TestConfiguration
configuration) {
return configuration.getSwagger();
}
});
}
});
}

@Override
public void run(final TestConfiguration configuration,
final Environment environment) {
environment.jersey()
.register(new TestController(new TestService(new TestDao())));
environment.jersey()
.register(new ClientController(
new ClientService(new ClientDao())));
environment.jersey()
.register(new EmployeeController(
new EmployeeService(new EmployeeDao())));
environment.jersey()
.register(new ProjectController(
new ProjectService(new ProjectDao(),
new ProjectValidator())));
}

}
33 changes: 33 additions & 0 deletions src/main/java/org/example/controllers/ClientController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.example.controllers;

import io.swagger.annotations.Api;
import org.example.services.ClientService;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.sql.SQLException;

@Api("Client API")
@Path("/api/clients")
public class ClientController {

ClientService clientService;

public ClientController(final ClientService clientService) {
this.clientService = clientService;
}

@GET
@Produces(MediaType.APPLICATION_JSON)
public Response
getClients() {
try {
return Response.ok().entity(clientService.getAllClients()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}
}
79 changes: 79 additions & 0 deletions src/main/java/org/example/controllers/EmployeeController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package org.example.controllers;

import io.swagger.annotations.Api;
import org.example.exceptions.DoesNotExistException;
import org.example.services.EmployeeService;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.sql.SQLException;

@Api("Employee Services API")
@Path("/api/employees")
public class EmployeeController {
private EmployeeService employeeService;

public EmployeeController(final EmployeeService employeeService) {
this.employeeService = employeeService;
}

@GET
@Path("/sales")
@Produces(MediaType.APPLICATION_JSON)
public Response getSalesEmployees() throws SQLException {
try {
return Response.ok().entity(
employeeService.getAllSalesEmployees()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}

@GET
@Path("/delivery")
@Produces(MediaType.APPLICATION_JSON)
public Response getDeliveryEmployees() throws SQLException {
try {
return Response.ok().entity(
employeeService.getAllDeliveryEmployees()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}
@GET
@Path("/sales/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getSalesEmployeeById(final @PathParam("id") int id)
throws SQLException {
try {
return Response.ok().entity(
employeeService.getSalesEmployeeById(id))
.build();
} catch (DoesNotExistException e) {
return Response.status(Response.Status.NOT_FOUND)
.entity(e.getMessage()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}
@GET
@Path("/delivery/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getDeliveryEmployeeById(final @PathParam("id") int id)
throws SQLException {
try {
return Response.ok().entity(
employeeService.getDeliveryEmployeeById(id))
.build();
} catch (DoesNotExistException e) {
return Response.status(Response.Status.NOT_FOUND)
.entity(e.getMessage()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}
}
57 changes: 57 additions & 0 deletions src/main/java/org/example/controllers/ProjectController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package org.example.controllers;

import io.swagger.annotations.Api;
import org.example.exceptions.FailedToCreateException;
import org.example.exceptions.InvalidException;
import org.example.models.ProjectDetailsRequest;
import org.example.services.ProjectService;

import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.sql.SQLException;

@Api("Project API")
@Path("/api/projects")
public class ProjectController {

ProjectService projectService;

public ProjectController(final ProjectService projectService) {
this.projectService = projectService;
}

@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/highestValue")
public Response
getHighestValueProject() {
try {
return Response.ok().entity(projectService
.getHighestValueProject()).build();
} catch (SQLException e) {
return Response.serverError().build();
}
}

@POST
@Produces(MediaType.APPLICATION_JSON)
@Path("/createProject")
public Response createProject(
final ProjectDetailsRequest projectDetailsRequest) {
try {
return Response
.status(Response.Status.CREATED)
.entity(projectService.createProject(projectDetailsRequest))
.build();
} catch (FailedToCreateException | SQLException e) {
return Response.serverError().build();
} catch (InvalidException e) {
return Response.status(Response.Status.BAD_REQUEST)
.entity(e.getMessage()).build();
}
}
}
40 changes: 40 additions & 0 deletions src/main/java/org/example/daos/ClientDao.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package org.example.daos;

import org.example.models.Client;
import org.example.models.ProjectRequest;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;

public class ClientDao {

public List<Client> getAllClients() throws SQLException {
List<Client> clients = new ArrayList<>();

try (Connection connection = DatabaseConnector.getConnection()) {
Statement statement = connection.createStatement();

ResultSet resultSet = statement.executeQuery(
"SELECT client.id AS 'Client ID', "
+ "salesID as 'Sales ID', project.id "
+ "AS 'Project ID' "
+ "FROM `client` JOIN `project` "
+ "ON (client.id = project.clientID);");

while (resultSet.next()) {
Client client = new Client(
resultSet.getInt("Client ID"),
resultSet.getInt("Sales ID"),
new ProjectRequest(
resultSet.getInt("Project ID")));

clients.add(client);
}
return clients;
}
}
}
Loading