[NCL-2396]: Review database model - other layers

project-ncl · Nov 11, 2016 · 492de66 · 492de66
1 parent 281cd00
commit 492de66
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 43 deletions.
diff --git a/datastore/src/test/java/org/jboss/pnc/datastore/DatastoreTest.java b/datastore/src/test/java/org/jboss/pnc/datastore/DatastoreTest.java
@@ -21,15 +21,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
-import org.jboss.pnc.model.Artifact;
-import org.jboss.pnc.model.ArtifactRepo;
-import org.jboss.pnc.model.BuildConfiguration;
-import org.jboss.pnc.model.BuildConfigurationAudited;
-import org.jboss.pnc.model.BuildEnvironment;
-import org.jboss.pnc.model.BuildRecord;
-import org.jboss.pnc.model.License;
-import org.jboss.pnc.model.Project;
-import org.jboss.pnc.model.SystemImageType;
+import org.jboss.pnc.model.*;
 import org.jboss.pnc.spi.datastore.Datastore;
 import org.jboss.pnc.spi.datastore.repositories.ArtifactRepository;
 import org.jboss.pnc.spi.datastore.repositories.BuildConfigurationAuditedRepository;
@@ -39,6 +31,7 @@
 import org.jboss.pnc.spi.datastore.repositories.LicenseRepository;
 import org.jboss.pnc.spi.datastore.repositories.ProductRepository;
 import org.jboss.pnc.spi.datastore.repositories.ProjectRepository;
+import org.jboss.pnc.spi.datastore.repositories.UserRepository;
 import org.jboss.pnc.test.category.ContainerTest;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Assert;
@@ -47,6 +40,7 @@
 import org.junit.runner.RunWith;
 
 import javax.inject.Inject;
+
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
@@ -97,6 +91,9 @@ public class DatastoreTest {
 
     @Inject
     LicenseRepository licenseRepository;
+
+    @Inject
+    UserRepository userRepository;
 
     @Inject
     Datastore datastore;
@@ -162,10 +159,16 @@ public void initBuildRecordData() throws Exception {
                 .importDate(Date.from(Instant.now()))
                 .repoType(ArtifactRepo.Type.MAVEN).build();
 
+        User user = User.Builder.newBuilder()
+                .username("pnc").email("pnc@redhat.com").build();
+        user = userRepository.save(user);
+        Assert.assertNotNull(user.getId());
+
         BuildRecord buildRecord = BuildRecord.Builder.newBuilder().id(datastore.getNextBuildRecordId())
                 .buildConfigurationAudited(buildConfigAud).latestBuildConfiguration(buildConfig)
                 .submitTime(Date.from(Instant.now())).startTime(Date.from(Instant.now())).endTime(Date.from(Instant.now()))
-                .builtArtifact(builtArtifact1).dependency(importedArtifact2).build();
+                .builtArtifact(builtArtifact1).dependency(importedArtifact2)
+                .user(user).build();
 
         builtArtifact1 = artifactRepository.save(builtArtifact1);
         importedArtifact2 = artifactRepository.save(importedArtifact2);
@@ -217,10 +220,17 @@ public void testDatastore() throws Exception {
                 .size(ARTIFACT_3_SIZE).originUrl("http://test/importArtifact2.jar")
                 .importDate(Date.from(Instant.now())).repoType(ArtifactRepo.Type.MAVEN).build();
 
+
+        User user = User.Builder.newBuilder()
+                .username("pnc2").email("pnc2@redhat.com").build();
+        user = userRepository.save(user);
+        Assert.assertNotNull(user.getId());
+
         BuildRecord.Builder buildRecordBuilder = BuildRecord.Builder.newBuilder().id(datastore.getNextBuildRecordId())
                 .buildConfigurationAudited(buildConfigAud).latestBuildConfiguration(buildConfig)
                 .submitTime(Date.from(Instant.now())).startTime(Date.from(Instant.now())).endTime(Date.from(Instant.now()))
-                .builtArtifact(builtArtifact1).dependency(importedArtifact2).builtArtifact(builtArtifact3);
+                .builtArtifact(builtArtifact1).dependency(importedArtifact2).builtArtifact(builtArtifact3)
+                .user(user);
 
         BuildRecord buildRecord = datastore.storeCompletedBuild(buildRecordBuilder);
 

diff --git a/integration-test/src/test/java/org/jboss/pnc/integration/BuildConfigurationRestTest.java b/integration-test/src/test/java/org/jboss/pnc/integration/BuildConfigurationRestTest.java
@@ -205,7 +205,6 @@ public void shouldUpdateBuildConfiguration() throws IOException {
         configurationTemplate.addValue("_scmRepoURL", PNC_REPO);
         configurationTemplate.addValue("_creationTime", String.valueOf(1518382545038L));
         configurationTemplate.addValue("_lastModificationTime", String.valueOf(155382545038L));
-        configurationTemplate.addValue("_repositories", "");
         configurationTemplate.addValue("_projectId", updatedProjectId);
         configurationTemplate.addValue("_environmentId", String.valueOf(environmentId));
         configurationTemplate.addValue("_genParamValue1", updatedGenParamValue);
@@ -284,8 +283,6 @@ public void shouldCloneBuildConfiguration() {
                 .isEqualTo(clonedBuildConfiguration.body().jsonPath().getString("content.buildScript"));
         assertThat(originalBuildConfiguration.body().jsonPath().getString("content.scmRepoURL"))
                 .isEqualTo(clonedBuildConfiguration.body().jsonPath().getString("content.scmRepoURL"));
-        assertThat(originalBuildConfiguration.body().jsonPath().getString("content.repositories"))
-                .isEqualTo(clonedBuildConfiguration.body().jsonPath().getString("content.repositories"));
         assertTrue(originalBuildConfiguration.body().jsonPath().getString("content.genericParameters.KEY1")
                 .equals(clonedBuildConfiguration.body().jsonPath().getString("content.genericParameters.KEY1")));
     }
@@ -300,7 +297,6 @@ public void shouldFailToCreateNewBuildConfigurationBecauseIdIsNotNull() throws I
         configurationTemplate.addValue("_environmentId", String.valueOf(environmentId));
         configurationTemplate.addValue("_creationTime", String.valueOf(1518382545038L));
         configurationTemplate.addValue("_lastModificationTime", String.valueOf(155382545038L));
-        configurationTemplate.addValue("_repositories", "");
 
         given().headers(testHeaders)
                 .body(configurationTemplate.fillTemplate()).contentType(ContentType.JSON).port(getHttpPort()).when()

diff --git a/integration-test/src/test/resources/buildConfiguration_create_template.json b/integration-test/src/test/resources/buildConfiguration_create_template.json
@@ -4,7 +4,6 @@
     "scmRepoURL":"https://github.com/project-ncl/pnc.git",
     "creationTime":1418382545021,
     "lastModificationTime":1418382545038,
-    "repositories":null,
     "project": {
       "id": ${_projectId}
     },

diff --git a/integration-test/src/test/resources/buildConfiguration_update_template.json b/integration-test/src/test/resources/buildConfiguration_update_template.json
@@ -4,7 +4,6 @@
     "scmRepoURL": "${_scmRepoURL}",
     "creationTime": ${_creationTime},
     "lastModificationTime": ${_lastModificationTime},
-    "repositories": "${_repositories}",
     "project": {
       "id": ${_projectId}
     },

diff --git a/integration-test/src/test/resources/buildConfiguration_with_id_template.json b/integration-test/src/test/resources/buildConfiguration_with_id_template.json
@@ -5,7 +5,6 @@
     "scmRepoURL": "${_scmRepoURL}",
     "creationTime": ${_creationTime},
     "lastModificationTime": ${_lastModificationTime},
-    "repositories": "${_repositories}",
     "project": {
       "id": ${_projectId}
     },

diff --git a/rest-model/src/main/java/org/jboss/pnc/rest/restmodel/BuildConfigurationAuditedRest.java b/rest-model/src/main/java/org/jboss/pnc/rest/restmodel/BuildConfigurationAuditedRest.java
@@ -67,8 +67,6 @@ public class BuildConfigurationAuditedRest implements GenericRestEntity<Integer>
 
     private Date lastModificationTime;
 
-    private String repositories;
-
     private Integer projectId;
 
     private Integer environmentId;
@@ -182,15 +180,7 @@ public Date getLastModificationTime() {
     public void setLastModificationTime(Date lastModificationTime) {
         this.lastModificationTime = lastModificationTime;
     }
-
-    public String getRepositories() {
-        return repositories;
-    }
-
-    public void setRepositories(String repositories) {
-        this.repositories = repositories;
-    }
-
+
     public Integer getProjectId() {
         return projectId;
     }
@@ -236,8 +226,7 @@ public BuildConfigurationAudited.Builder toDBEntityBuilder() {
                 .scmExternalRepoURL(scmExternalRepoURL)
                 .scmExternalRevision(scmRevision)
                 .creationTime(creationTime)
-                .lastModificationTime(lastModificationTime)
-                .repositories(repositories);
+                .lastModificationTime(lastModificationTime);
 
         performIfNotNull(this.project, () -> buildConfigBuilder.project(this.project.toDBEntityBuilder().build()));
         performIfNotNull(this.environment,

diff --git a/rest-model/src/main/java/org/jboss/pnc/rest/restmodel/BuildConfigurationRest.java b/rest-model/src/main/java/org/jboss/pnc/rest/restmodel/BuildConfigurationRest.java
@@ -75,8 +75,6 @@ public class BuildConfigurationRest implements GenericRestEntity<Integer> {
 
     private boolean archived;
 
-    private String repositories;
-
     @NotNull(groups = WhenCreatingNew.class)
     private ProjectRest project;
 
@@ -106,7 +104,6 @@ public BuildConfigurationRest(BuildConfiguration buildConfiguration) {
         this.creationTime = buildConfiguration.getCreationTime();
         this.lastModificationTime = buildConfiguration.getLastModificationTime();
         this.archived = buildConfiguration.isArchived();
-        this.repositories = buildConfiguration.getRepositories();
         this.genericParameters = buildConfiguration.getGenericParameters();
         performIfNotNull(buildConfiguration.getProject(),
                 () -> this.project = new ProjectRest(buildConfiguration.getProject()));
@@ -192,14 +189,6 @@ public void setArchived(boolean archived) {
         this.archived = archived;
     }
 
-    public String getRepositories() {
-        return repositories;
-    }
-
-    public void setRepositories(String repositories) {
-        this.repositories = repositories;
-    }
-
     public ProjectRest getProject() {
         return project;
     }
@@ -251,7 +240,6 @@ public BuildConfiguration.Builder toDBEntityBuilder() {
                 .scmExternalRepoURL(this.getScmExternalRepoURL())
                 .scmExternalRevision(this.getScmExternalRevision())
                 .archived(this.isArchived())
-                .repositories(this.getRepositories())
                 .genericParameters(this.getGenericParameters());
 
         performIfNotNull(this.getProject(), () -> builder.project(this.getProject().toDBEntityBuilder().build()));