Merge to master

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**
 !**/src/test/**
+bin/
 
 ### STS ###
 .apt_generated

build.gradle

@@ -25,6 +25,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.data:spring-data-rest-hal-browser'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'com.h2database:h2'
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {

src/main/java/com/invoicetracker/Populator.java

@@ -0,0 +1,185 @@
+package com.invoicetracker;
+
+import java.time.LocalDate;
+import javax.annotation.Resource;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import com.invoicetracker.models.Contractor;
+import com.invoicetracker.models.Invoice;
+import com.invoicetracker.models.ServiceItem;
+import com.invoicetracker.repositories.ContractorRepository;
+import com.invoicetracker.repositories.InvoiceRepository;
+import com.invoicetracker.repositories.ServiceItemRepository;
+
+@Component
+public class Populator implements CommandLineRunner {
+
+	@Resource
+	ServiceItemRepository serviceItemRepo;
+
+	@Resource
+	InvoiceRepository invoiceRepo;
+
+	@Resource
+	ContractorRepository contractorRepo;
+
+	@Override
+	public void run(String... args) throws Exception {
+
+		/*
+		 * Contractor_A has 5 invoices called invoice_A1...A5 each invoice has 1 to 4
+		 * service items
+		 */
+		Contractor contractor_A = new Contractor();
+		contractor_A.setEmail("[email protected]");
+		contractor_A.setAddressLineOne("Center St");
+		contractor_A.setAddressLineTwo("Suite A");
+		contractor_A.setCity("Cityville");
+		contractor_A.setState("Alabama");
+		contractor_A.setZip("90210");
+		contractor_A.setCountry("USA");
+		contractor_A.setPhoneNumber("(555) 555-5555");
+		contractor_A.setFirstName("Andy");
+		contractor_A.setLastName("Amoray");
+		contractor_A.setPayPalId("AndyAmorayPayPal");
+		contractorRepo.save(contractor_A);
+
+		/********* Next invoice and service items *************/
+		{
+			Invoice invoice_A1 = new Invoice(contractor_A);
+			LocalDate dateInvoice_A1 = LocalDate.of(2020, 03, 28);
+			invoice_A1.setDateOfInvoice(dateInvoice_A1);
+			invoice_A1.setInvoiceNote("Students did a great job applying themselves durring both sessions, I am very impressed with the progress!");
+			invoice_A1.setIsPaid(false);
+			invoiceRepo.save(invoice_A1);
+			contractorRepo.save(contractor_A);
+
+			ServiceItem serviceItem_A1 = new ServiceItem(invoice_A1);
+			LocalDate dateServiceItem_A1 = LocalDate.of(2020, 03, 11);
+			serviceItem_A1.setDateOfService(dateServiceItem_A1);
+			serviceItem_A1.setAmountDue(100);
+			serviceItem_A1.setServiceDescription("Tutored Alley");
+			serviceItemRepo.save(serviceItem_A1);
+
+			ServiceItem serviceItem_A2 = new ServiceItem(invoice_A1);
+			LocalDate dateServiceItem_A2 = LocalDate.of(2020, 02, 01);
+			serviceItem_A2.setDateOfService(dateServiceItem_A2);
+			serviceItem_A2.setAmountDue(150);
+			serviceItem_A2.setServiceDescription("Tutored Allen");
+			serviceItemRepo.save(serviceItem_A2);
+		}
+		/********* Next invoice and service items *************/
+		{
+			Invoice invoice_A2 = new Invoice(contractor_A);
+			LocalDate dateInvoice_A2 = LocalDate.of(2020, 03, 11);
+			invoice_A2.setDateOfInvoice(dateInvoice_A2);
+			invoice_A2.setInvoiceNote("Students did a great job applying themselves durring both sessions, I am very impressed with the progress!");
+			invoice_A2.setIsPaid(false);
+			invoiceRepo.save(invoice_A2);
+
+			ServiceItem serviceItem_A3 = new ServiceItem(invoice_A2);
+			LocalDate dateServiceItem_A3 = LocalDate.of(2020, 02, 12);
+			serviceItem_A3.setDateOfService(dateServiceItem_A3);
+			serviceItem_A3.setAmountDue(200);
+			serviceItem_A3.setServiceDescription("Tutored Billy");
+			serviceItemRepo.save(serviceItem_A3);
+
+			ServiceItem serviceItem_A4 = new ServiceItem(invoice_A2);
+			LocalDate dateServiceItem_A4 = LocalDate.of(2020, 02, 02);
+			serviceItem_A4.setDateOfService(dateServiceItem_A4);
+			serviceItem_A4.setAmountDue(250);
+			serviceItem_A4.setServiceDescription("Tutored Bobo");
+			serviceItemRepo.save(serviceItem_A4);
+
+			ServiceItem serviceItem_A5 = new ServiceItem(invoice_A2);
+			LocalDate dateServiceItem_A5 = LocalDate.of(2020, 02, 01);
+			serviceItem_A5.setDateOfService(dateServiceItem_A5);
+			serviceItem_A5.setAmountDue(350);
+			serviceItem_A5.setServiceDescription("Tutored Bathsheba");
+			serviceItemRepo.save(serviceItem_A5);
+		}
+		/********* Next invoice and service items *************/
+		{
+			Invoice invoice_A3 = new Invoice(contractor_A);
+			LocalDate dateInvoice_A3 = LocalDate.of(2020, 03, 11);
+			invoice_A3.setDateOfInvoice(dateInvoice_A3);
+			invoice_A3.setInvoiceNote("Contractor A's Third Invoice");
+			invoice_A3.setIsPaid(false);
+			invoiceRepo.save(invoice_A3);
+
+			ServiceItem serviceItem_A6 = new ServiceItem(invoice_A3);
+			LocalDate dateServiceItem_A6 = LocalDate.of(2020, 02, 12);
+			serviceItem_A6.setDateOfService(dateServiceItem_A6);
+			serviceItem_A6.setAmountDue(200);
+			serviceItem_A6.setServiceDescription("Tutored Chanel");
+			serviceItemRepo.save(serviceItem_A6);
+
+			ServiceItem serviceItem_A7 = new ServiceItem(invoice_A3);
+			LocalDate dateServiceItem_A7 = LocalDate.of(2020, 02, 02);
+			serviceItem_A7.setDateOfService(dateServiceItem_A7);
+			serviceItem_A7.setAmountDue(250);
+			serviceItem_A7.setServiceDescription("Tutored Chira");
+			serviceItemRepo.save(serviceItem_A7);
+
+			ServiceItem serviceItem_A8 = new ServiceItem(invoice_A3);
+			LocalDate dateServiceItem_A8 = LocalDate.of(2020, 02, 01);
+			serviceItem_A8.setDateOfService(dateServiceItem_A8);
+			serviceItem_A8.setAmountDue(350);
+			serviceItem_A8.setServiceDescription("Tutored Carton'O");
+			serviceItemRepo.save(serviceItem_A8);
+		}
+		/********* Next invoice and service items *************/
+		{
+			Invoice invoice_A4 = new Invoice(contractor_A);
+			LocalDate dateInvoice_A4 = LocalDate.of(2020, 03, 11);
+			invoice_A4.setDateOfInvoice(dateInvoice_A4);
+			invoice_A4.setInvoiceNote("Contractor A's Fourth Invoice");
+			invoice_A4.setIsPaid(false);
+			invoiceRepo.save(invoice_A4);
+
+			ServiceItem serviceItem_A9 = new ServiceItem(invoice_A4);
+			LocalDate dateServiceItem_A9 = LocalDate.of(2020, 02, 12);
+			serviceItem_A9.setDateOfService(dateServiceItem_A9);
+			serviceItem_A9.setAmountDue(200);
+			serviceItem_A9.setServiceDescription("Tutored David");
+			serviceItemRepo.save(serviceItem_A9);
+
+			ServiceItem serviceItem_A10 = new ServiceItem(invoice_A4);
+			LocalDate dateServiceItem_A10 = LocalDate.of(2020, 02, 02);
+			serviceItem_A10.setDateOfService(dateServiceItem_A10);
+			serviceItem_A10.setAmountDue(250);
+			serviceItem_A10.setServiceDescription("Tutored Donna");
+			serviceItemRepo.save(serviceItem_A10);
+
+			ServiceItem serviceItem_A11 = new ServiceItem(invoice_A4);
+			LocalDate dateServiceItem_A11 = LocalDate.of(2020, 02, 01);
+			serviceItem_A11.setDateOfService(dateServiceItem_A11);
+			serviceItem_A11.setAmountDue(350);
+			serviceItem_A11.setServiceDescription("Tutored Dauphny");
+			serviceItemRepo.save(serviceItem_A11);
+
+			ServiceItem serviceItem_A12 = new ServiceItem(invoice_A4);
+			LocalDate dateServiceItem_A12 = LocalDate.of(2020, 02, 01);
+			serviceItem_A12.setDateOfService(dateServiceItem_A12);
+			serviceItem_A12.setAmountDue(350);
+			serviceItem_A12.setServiceDescription("Tutored Le'Don");
+			serviceItemRepo.save(serviceItem_A12);
+		}
+		/********* Next invoice and service items *************/
+		{
+			Invoice invoice_A5 = new Invoice(contractor_A);
+			LocalDate dateInvoice_A5 = LocalDate.of(2020, 01, 11);
+			invoice_A5.setDateOfInvoice(dateInvoice_A5);
+			invoice_A5.setInvoiceNote("Contractor A's Fith Invoice");
+			invoice_A5.setIsPaid(false);
+			invoiceRepo.save(invoice_A5);
+
+			ServiceItem serviceItem_A13 = new ServiceItem(invoice_A5);
+			LocalDate dateServiceItem_A13 = LocalDate.of(2020, 02, 12);
+			serviceItem_A13.setDateOfService(dateServiceItem_A13);
+			serviceItem_A13.setAmountDue(200);
+			serviceItem_A13.setServiceDescription("Tutored Erin");
+			serviceItemRepo.save(serviceItem_A13);
+		}
+	}
+}

src/main/java/com/invoicetracker/controllers/ContractorController.java

@@ -0,0 +1,89 @@
+package com.invoicetracker.controllers;
+
+import java.util.Collection;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.invoicetracker.models.Contractor;
+import com.invoicetracker.models.Invoice;
+import com.invoicetracker.repositories.ContractorRepository;
+import com.invoicetracker.repositories.InvoiceRepository;
+
+@RequestMapping("/contractor")
+@Controller
+public class ContractorController {
+
+	@Resource
+	private ContractorRepository contractorRepo;
+
+	@Resource
+	private InvoiceRepository invoiceRepo;
+
+	@GetMapping("/create-new-invoice/{contractorId}")
+	private String createInvoice(@PathVariable(value = "contractorId") long contractorId, Model model) {
+		Contractor contractor = contractorRepo.findById(contractorId).get();
+		model.addAttribute("contractor", contractor);
+		return "create-invoice";
+	}
+
+	@GetMapping("/update-profile/{contractorId}")
+	private String updateProfile(@PathVariable(value = "contractorId") long contractorId, Model model) {
+		Contractor contractor = contractorRepo.findById(contractorId).get();
+		model.addAttribute("contractor", contractor);
+		return "profile";
+	}
+
+
+	@GetMapping("/view-existing-invoice/{contractorId}/{invoiceId}")
+	private String viewInvoice(@PathVariable(value = "contractorId") long contractorId,
+			@PathVariable(value = "invoiceId") long invoiceId, Model model) {
+
+		Contractor contractor = contractorRepo.findById(contractorId).get();
+		Invoice invoice = invoiceRepo.findById(invoiceId).get();
+
+		model.addAttribute("contractor", contractor);
+		model.addAttribute("invoice", invoice);
+
+		return "view-invoice";
+	}
+
+	@GetMapping("/search-invoice-list/{contractorId}")
+	private String viewInvoiceList(@PathVariable(value = "contractorId") long contractorId, Model model) {
+
+		Contractor contractor = contractorRepo.findById(contractorId).get();
+		Collection<Invoice> invoices = contractor.getInvoices();
+		model.addAttribute("invoices", invoices);
+		model.addAttribute("contractor", contractor);
+
+		return "search-invoice-list";
+	}
+
+	/*
+	 * TODO Needs Code Review:
+	 * I do not think a @PutMapping is right, but it is working. 
+	 */
+	@PutMapping("/mark-invoice-paid/{invoiceId}")
+	private void markInvoicePaid(@PathVariable(value = "invoiceId") long invoiceId){
+
+		Invoice invoiceToMarkPaid = invoiceRepo.findById(invoiceId).get();
+		invoiceToMarkPaid.setIsPaid(true);
+		invoiceRepo.save(invoiceToMarkPaid);
+	}
+
+	/*
+	 * TODO Needs Code Review:
+	 * I do not think a @PutMapping is right, but it is working. 
+	 */
+	@PutMapping("/mark-invoice-sent/{invoiceId}")
+	private void markInvoiceSent(@PathVariable(value = "invoiceId") long invoiceId){
+
+		Invoice invoiceToSend = invoiceRepo.findById(invoiceId).get();
+		invoiceToSend.setIsSent(true);
+		invoiceRepo.save(invoiceToSend);
+	}
+
+}

src/main/java/com/invoicetracker/controllers/InvoiceController.java

@@ -0,0 +1,69 @@
+package com.invoicetracker.controllers;
+
+import java.time.LocalDate;
+
+import javax.annotation.Resource;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+//the jar file for this import is on the desktop 
+// source of file is found https://stackoverflow.com/questions/8997598/importing-json-into-an-eclipse-project
+import org.json.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.invoicetracker.models.Invoice;
+import com.invoicetracker.models.ServiceItem;
+import com.invoicetracker.repositories.ContractorRepository;
+import com.invoicetracker.repositories.InvoiceRepository;
+import com.invoicetracker.repositories.ServiceItemRepository;
+
+@CrossOrigin
+@Controller
+public class InvoiceController {
+
+	@Resource
+	private InvoiceRepository invoiceRepo;
+
+	@Resource
+	private ServiceItemRepository serviceItemRepo;
+
+	@Resource
+	private ContractorRepository contractorItemRepo;
+
+	@RequestMapping("submit-invoice")
+	private void createNewInvoice(@RequestBody String body) throws JSONException {
+
+		/* Create the invoice */
+		JSONObject newInvoice = new JSONObject(body);
+
+		String dateOfInvoice = newInvoice.getJSONObject("invoiceNumbersJson").getString("invoiceDate");
+		LocalDate localDate = LocalDate.parse(dateOfInvoice);
+		Invoice invoice = new Invoice(localDate);
+
+		int invoiceNumber = newInvoice.getJSONObject("invoiceNumbersJson").getInt("invoiceNumber");
+		invoice.setInvoiceNumber(invoiceNumber);		
+		invoiceRepo.save(invoice);
+
+		/* Add Service Items */
+		JSONArray serviceItemsArray = newInvoice.getJSONArray("invoiceArray");
+
+		for(int i = 0; i < serviceItemsArray.length(); i++) {
+
+			JSONObject aServiceItem = (JSONObject) serviceItemsArray.get(2);
+			String serviceDate = aServiceItem.getString("serviceDate");
+			LocalDate localServiceDate = LocalDate.parse(serviceDate);
+			ServiceItem newServiceItem = new ServiceItem(localServiceDate, invoice);
+			serviceItemRepo.save(newServiceItem);
+		}
+
+		contractorItemRepo.findById(27L).get().addInvoice(invoice);
+
+	}
+
+}

src/main/java/com/invoicetracker/controllers/InvoiceRestController.java

@@ -0,0 +1,22 @@
+package com.invoicetracker.controllers;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.invoicetracker.models.Invoice;
+import com.invoicetracker.repositories.InvoiceRepository;
+
+@RestController
+public class InvoiceRestController {
+
+	@Resource
+	private InvoiceRepository invoiceRepo;
+
+	@GetMapping("/api/invoice/{id}")
+	public Invoice retrieveInvoice(@PathVariable Long id) {
+		return invoiceRepo.findById(id).get();
+	}
+}