use customer/package/unixuser only as test data structure (Java part)
This commit is contained in:
@ -1,21 +0,0 @@
|
||||
package net.hostsharing.hsadminng.hs.hscustomer;
|
||||
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.Repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CustomerRepository extends Repository<CustomerEntity, UUID> {
|
||||
|
||||
|
||||
Optional<CustomerEntity> findByUuid(UUID id);
|
||||
|
||||
@Query("SELECT c FROM CustomerEntity c WHERE :prefix is null or c.prefix like concat(:prefix, '%')")
|
||||
List<CustomerEntity> findCustomerByOptionalPrefixLike(String prefix);
|
||||
|
||||
CustomerEntity save(final CustomerEntity entity);
|
||||
|
||||
long count();
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package net.hostsharing.hsadminng.hs.hscustomer;
|
||||
package net.hostsharing.hsadminng.test.cust;
|
||||
|
||||
import net.hostsharing.hsadminng.context.Context;
|
||||
import net.hostsharing.hsadminng.generated.api.v1.api.CustomersApi;
|
||||
@ -17,13 +17,13 @@ import static net.hostsharing.hsadminng.Mapper.mapList;
|
||||
|
||||
@RestController
|
||||
|
||||
public class CustomerController implements CustomersApi {
|
||||
public class TestCustomerController implements CustomersApi {
|
||||
|
||||
@Autowired
|
||||
private Context context;
|
||||
|
||||
@Autowired
|
||||
private CustomerRepository customerRepository;
|
||||
private TestCustomerRepository testCustomerRepository;
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
@ -34,7 +34,7 @@ public class CustomerController implements CustomersApi {
|
||||
) {
|
||||
context.define(currentUser, assumedRoles);
|
||||
|
||||
final var result = customerRepository.findCustomerByOptionalPrefixLike(prefix);
|
||||
final var result = testCustomerRepository.findCustomerByOptionalPrefixLike(prefix);
|
||||
|
||||
return ResponseEntity.ok(mapList(result, CustomerResource.class));
|
||||
}
|
||||
@ -52,7 +52,7 @@ public class CustomerController implements CustomersApi {
|
||||
customer.setUuid(UUID.randomUUID());
|
||||
}
|
||||
|
||||
final var saved = customerRepository.save(map(customer, CustomerEntity.class));
|
||||
final var saved = testCustomerRepository.save(map(customer, TestCustomerEntity.class));
|
||||
|
||||
final var uri =
|
||||
MvcUriComponentsBuilder.fromController(getClass())
|
@ -1,4 +1,4 @@
|
||||
package net.hostsharing.hsadminng.hs.hscustomer;
|
||||
package net.hostsharing.hsadminng.test.cust;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
@ -14,7 +14,7 @@ import java.util.UUID;
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CustomerEntity {
|
||||
public class TestCustomerEntity {
|
||||
private @Id UUID uuid;
|
||||
private String prefix;
|
||||
private int reference;
|
@ -0,0 +1,21 @@
|
||||
package net.hostsharing.hsadminng.test.cust;
|
||||
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.Repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface TestCustomerRepository extends Repository<TestCustomerEntity, UUID> {
|
||||
|
||||
|
||||
Optional<TestCustomerEntity> findByUuid(UUID id);
|
||||
|
||||
@Query("SELECT c FROM TestCustomerEntity c WHERE :prefix is null or c.prefix like concat(:prefix, '%')")
|
||||
List<TestCustomerEntity> findCustomerByOptionalPrefixLike(String prefix);
|
||||
|
||||
TestCustomerEntity save(final TestCustomerEntity entity);
|
||||
|
||||
long count();
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package net.hostsharing.hsadminng.hs.hspackage;
|
||||
package net.hostsharing.hsadminng.test.pac;
|
||||
|
||||
import net.hostsharing.hsadminng.OptionalFromJson;
|
||||
import net.hostsharing.hsadminng.context.Context;
|
||||
@ -28,9 +28,9 @@ public class PackageController implements PackagesApi {
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public ResponseEntity<List<PackageResource>> listPackages(
|
||||
String currentUser,
|
||||
String assumedRoles,
|
||||
String name
|
||||
String currentUser,
|
||||
String assumedRoles,
|
||||
String name
|
||||
) {
|
||||
context.define(currentUser, assumedRoles);
|
||||
|
||||
@ -41,10 +41,10 @@ public class PackageController implements PackagesApi {
|
||||
@Override
|
||||
@Transactional
|
||||
public ResponseEntity<PackageResource> updatePackage(
|
||||
final String currentUser,
|
||||
final String assumedRoles,
|
||||
final UUID packageUuid,
|
||||
final PackageUpdateResource body) {
|
||||
final String currentUser,
|
||||
final String assumedRoles,
|
||||
final UUID packageUuid,
|
||||
final PackageUpdateResource body) {
|
||||
|
||||
context.define(currentUser, assumedRoles);
|
||||
|
@ -1,10 +1,10 @@
|
||||
package net.hostsharing.hsadminng.hs.hspackage;
|
||||
package net.hostsharing.hsadminng.test.pac;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import net.hostsharing.hsadminng.hs.hscustomer.CustomerEntity;
|
||||
import net.hostsharing.hsadminng.test.cust.TestCustomerEntity;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.UUID;
|
||||
@ -24,7 +24,7 @@ public class PackageEntity {
|
||||
|
||||
@ManyToOne(optional = false)
|
||||
@JoinColumn(name = "customeruuid")
|
||||
private CustomerEntity customer;
|
||||
private TestCustomerEntity customer;
|
||||
|
||||
private String name;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package net.hostsharing.hsadminng.hs.hspackage;
|
||||
package net.hostsharing.hsadminng.test.pac;
|
||||
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.Repository;
|
Reference in New Issue
Block a user