Review comments

This commit is contained in:
Torge Hamann 2024-11-17 22:27:39 +01:00
parent 9b281a3af1
commit 5e30337086
7 changed files with 11 additions and 21 deletions

View file

@ -19,9 +19,7 @@ public class Certificate {
private String id;
@NotNull
private String oid;
@NotNull
@Enumerated(EnumType.STRING)
private CertificateType type;
@NotNull

View file

@ -4,6 +4,7 @@ import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@ -12,8 +13,9 @@ import lombok.Setter;
public class User {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE)
private Long id;
@GeneratedValue(strategy = GenerationType.UUID)
@Setter(AccessLevel.NONE)
private String id;
@Setter
private String username;

View file

@ -9,6 +9,7 @@ import lombok.Data;
public class CertificateRequest {
@Builder.Default
@Deprecated
private String oid = UUID.randomUUID().toString();
private RequestType type;

View file

@ -5,6 +5,4 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface CertificateRepository extends CrudRepository<Certificate, String> {
Certificate findByOid(String oid);
}
public interface CertificateRepository extends CrudRepository<Certificate, String> {}

View file

@ -5,4 +5,4 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends CrudRepository<User, Long> {}
public interface UserRepository extends CrudRepository<User, String> {}

View file

@ -1,7 +1,6 @@
package de.mlessmann.certassist.repositories;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import de.mlessmann.certassist.models.CertificateExtension;
import jakarta.transaction.Transactional;

View file

@ -22,7 +22,6 @@ class CertificateRepositoryTest {
private Certificate getCertificate() {
final Certificate certificate = new Certificate();
certificate.setOid("test");
certificate.setCommonName("test-cn");
certificate.setType(CertificateType.NORMAL_CERTIFICATE);
certificate.setRequestedKeyLength(1);
@ -37,16 +36,9 @@ class CertificateRepositoryTest {
final Certificate certificate = getCertificate();
repository.save(certificate);
assertThat(repository.findById(certificate.getId()).orElseThrow().getOid()).isEqualTo("test");
}
@Test
@Transactional
void findCertificateByOid() {
final Certificate certificate = getCertificate();
repository.save(certificate);
assertThat(repository.findByOid("test").getCommonName()).isEqualTo("test-cn");
Certificate foundCertificate = repository.findById(certificate.getId()).orElseThrow();
assertThat(foundCertificate.getCommonName()).isEqualTo("test-cn");
assertThat(foundCertificate.getType()).isEqualTo(CertificateType.NORMAL_CERTIFICATE);
}
@Test