Browse Source

update customer & comment the "customer" in project service

tags/Baseline_30082024_BACKEND_UAT
cyril.tsui 1 year ago
parent
commit
61f3266bb6
4 changed files with 23 additions and 16 deletions
  1. +1
    -0
      src/main/java/com/ffii/tsms/modules/data/entity/Customer.java
  2. +3
    -0
      src/main/java/com/ffii/tsms/modules/data/service/CustomerService.kt
  3. +3
    -0
      src/main/java/com/ffii/tsms/modules/data/web/models/SaveCustomerRequest.kt
  4. +16
    -16
      src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt

+ 1
- 0
src/main/java/com/ffii/tsms/modules/data/entity/Customer.java View File

@@ -30,6 +30,7 @@ public class Customer extends BaseEntity<Long> {
private String brNo;

@OneToOne
@NotNull
@JoinColumn(name = "typeId")
private CustomerType customerType;



+ 3
- 0
src/main/java/com/ffii/tsms/modules/data/service/CustomerService.kt View File

@@ -24,12 +24,15 @@ class CustomerService(private val customerRepository: CustomerRepository, privat

fun saveCustomer(saveCustomer: SaveCustomerRequest): Customer {

val customerType = customerTypeRepository.findById(saveCustomer.typeId).orElseThrow()

val customer =
customerRepository.saveAndFlush(
Customer().apply {
id = saveCustomer.id
code = saveCustomer.code
name = saveCustomer.name
this.customerType = customerType
address = saveCustomer.address
district = saveCustomer.district
brNo = saveCustomer.brNo


+ 3
- 0
src/main/java/com/ffii/tsms/modules/data/web/models/SaveCustomerRequest.kt View File

@@ -1,12 +1,15 @@
package com.ffii.tsms.modules.project.web.models

import jakarta.validation.constraints.NotBlank
import jakarta.validation.constraints.NotNull

data class SaveCustomerRequest(
@field:NotBlank(message = "customer code cannot be empty")
val code: String,
@field:NotBlank(message = "customer name cannot be empty")
val name: String,
@field:NotNull(message = "customer name cannot be empty")
val typeId: Long,

val brNo: String?,
val address: String?,


+ 16
- 16
src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt View File

@@ -31,21 +31,21 @@ class ProjectsService(
projectCategoryRepository.findById(request.projectCategoryId).orElseThrow()
val teamLead = staffRepository.findById(request.projectLeadId).orElseThrow()

val _customer =
SaveCustomerRequest(
name = request.clientName,
code = request.clientCode,
// email = request.clientEmail,
// phone = request.clientPhone,
// contactName = request.clientContactName,
brNo = null,
address = null,
district = null,
deleteSubsidiaryIds = emptyList(),
addSubsidiaryIds = emptyList(),
id = null
)
val customer = customerService.saveCustomer(_customer)
// val _customer =
// SaveCustomerRequest(
// name = request.clientName,
// code = request.clientCode,
// // email = request.clientEmail,
// // phone = request.clientPhone,
// // contactName = request.clientContactName,
// brNo = null,
// address = null,
// district = null,
// deleteSubsidiaryIds = emptyList(),
// addSubsidiaryIds = emptyList(),
// id = null
// )
// val customer = customerService.saveCustomer(_customer)

// TODO: Add tasks, milestones, allocated
val project =
@@ -55,7 +55,7 @@ class ProjectsService(
code = request.projectCode
this.projectCategory = projectCategory
this.teamLead = teamLead
this.customer = customer
// this.customer = customer
}

return projectRepository.save(project)


Loading…
Cancel
Save