BA Meyer final commit

.docker/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3'
+services:
+  db:
+    image: postgres:10
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    networks:
+      - default
+networks:
+  default:
+    driver: bridge

.gitignore

@@ -1,3 +1,4 @@
+
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
@@ -30,10 +31,13 @@ build/
 ### VS Code ###
 .vscode/
 
+### MacOS File System ###
+**/.DS_STORE
+
 ### TexRendering ###
 *.png
 *.tex
 *.pdf
 *.log
 *.aux
-*.svg
+*.svg

docs/dev/index.md

@@ -1,10 +1,14 @@
 # PatternAtlas Developer Guide
-This document provides an index to all development guidelines and background information of the PatternPedia.
+This document provides an index to all development guidelines and background information of the PatternAtlas.
 - [ADR](/adr) - Information on Architectural decisions can be found here
 
 ## Quick Develop
-<!---
 ### PatternPediaAuth
+PatternPediaAuth is a Spring Boot Authentication Server and it's main purpose is to give PatternAtlasAPI user management capabilities.
+This is achieved through using the OAuth 2.0 Authentication Code Flow, additionally new users can create accounts.
+It runs on Port 8081
+
+### Development
 1. Clone the repository `git clone https://github.com/PatternAtlas/pattern-pedia-auth.git`.
 2. Navigate to repository directory `cd pattern-pedia-auth/`.
 2. Build the repository 
@@ -22,8 +26,12 @@ This document provides an index to all development guidelines and background inf
 5. Insert the following commands  `docker-compose up -d`
 
 #### IntelliJ
-3. [Follow PatternPediaAPI from Step 5 pls](#step5) 
+3. [Follow PatternAtlasAPI from Step 5 pls](#step5)
 
+#### Turn authentication on/off for PatternAtlasAPI
+If you don't need the capabilities of the PatternPediaAuth server during development. You can follow the instructions in the following file 
+[Security Config file](https://github.com/PatternAtlas/pattern-atlas-api/blob/ba-meyer-master/src/main/java/io/github/patternatlas/api/config/ResourceServerConfig.java)
+to turn those off or on. An easier way will be added in a future realease.
 
 #### Default User
 During development default users are
@@ -32,9 +40,9 @@ During development default users are
 
 ### PatternAtlasAPI 
 --->
-1. Clone the repository `git clone https://github.com/PatternPedia/pattern-atlas-api.git`.
+1. Clone the repository `git clone https://github.com/PatternAtlas/pattern-atlas-api.git`.
 2. Build the repository `mvn package -DskipTests` (skiping the tests for a faster build), Java 8 required.
-3. Clone the repository `git clone https://github.com/PatternPedia/pattern-atlas-ui.git`.
+3. Clone the repository `git clone https://github.com/PatternAtlas/pattern-atlas-ui.git`.
 4. Build the repository `mvn package -DskipTests` (skiping the tests for a faster build), npm is required. (plus yarn, optionally)
 5. <a name="step5"></a>Continue your IDE setup:
     - [IntelliJ Ultimate](IntelliJ/)

src/main/java/io/github/patternatlas/api/PatternAtlasAPI.java

@@ -4,20 +4,33 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import com.vladmihalcea.hibernate.type.util.Configuration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Contact;
 import io.swagger.v3.oas.annotations.info.Info;
+
+import com.vladmihalcea.hibernate.type.util.Configuration;
+
 import lombok.extern.slf4j.Slf4j;
 
+import io.github.patternatlas.api.rest.controller.UserController;
+import io.github.patternatlas.api.service.IssueService;
+
 @EnableTransactionManagement
 @Slf4j
+@RestController
 @SpringBootApplication
 @OpenAPIDefinition(info = @Info(title = "pattern-atlas-api", version = "1.0", contact = @Contact(url = "https://github.com/PatternAtlas/pattern-atlas-api", name = "Pattern Atlas API")))
 public class PatternAtlasAPI implements CommandLineRunner {
 
+    @Autowired
+    private UserController userController;
+
+    @Autowired
+    private IssueService issueService;
+
     public static void main(String[] args) {
         System.setProperty(Configuration.PropertyKey.PRINT_BANNER.getKey(), Boolean.FALSE.toString());
         SpringApplication.run(PatternAtlasAPI.class, args);

src/main/java/io/github/patternatlas/api/config/Authority.java

@@ -0,0 +1,43 @@
+package io.github.patternatlas.api.config;
+
+public interface Authority {
+    /** ISSUE */
+    String ISSUE_READ                               = "hasAuthority('ISSUE_READ')";
+    String ISSUE_CREATE                             = "hasAuthority(ISSUE_CREATE')";
+    String ISSUE_EDIT                               = "hasAuthority('ISSUE_EDIT')";
+    String ISSUE_DELETE                             = "hasAuthority('ISSUE_DELETE')";
+    String ISSUE_READ_ALL                           = "hasAuthority('ISSUE_READ_ALL')";
+    String ISSUE_EDIT_ALL                           = "hasAuthority('ISSUE_EDIT_ALL')";
+    String ISSUE_DELETE_ALL                         = "hasAuthority('ISSUE_DELETE_ALL')";
+    String ISSUE_TO_PATTERN_CANDIDATE               = "hasAuthority('ISSUE_TO_PATTERN_CANDIDATE')";
+    /** CANDIDATE */
+    String PATTERN_CANDIDATE_READ                   = "hasAuthority('PATTERN_CANDIDATE_READ')";
+    String PATTERN_CANDIDATE_CREATE                 = "hasAuthority('PATTERN_CANDIDATE_CREATE')";
+    String PATTERN_CANDIDATE_EDIT                   = "hasAuthority('PATTERN_CANDIDATE_EDIT')";
+    String PATTERN_CANDIDATE_DELETE                 = "hasAuthority('PATTERN_CANDIDATE_DELETE')";
+    String PATTERN_CANDIDATE_READ_ALL               = "hasAuthority('PATTERN_CANDIDATE_READ_ALL')";
+    String PATTERN_CANDIDATE_EDIT_ALL               = "hasAuthority('PATTERN_CANDIDATE_EDIT_ALL')";
+    String PATTERN_CANDIDATE_DELETE_ALL             = "hasAuthority('PATTERN_CANDIDATE_DELETE_ALL')";
+    String PATTERN_CANDIDATE_TO_PATTERN             = "hasAuthority('PATTERN_CANDIDATE_TO_PATTERN')";
+    /** Pattern */
+    String APPROVED_PATTERN_READ                    = "hasAuthority(APPROVED_PATTERN_READ')";
+    String APPROVED_PATTERN_CREATE                  = "hasAuthority('APPROVED_PATTERN_CREATE')";
+    String APPROVED_PATTERN_EDIT                    = "hasAuthority('APPROVED_PATTERN_EDIT')";
+    String APPROVED_PATTERN_DELETE                  = "hasAuthority('APPROVED_PATTERN_DELETE')";
+    String APPROVED_PATTERN_READ_ALL                = "hasAuthority('APPROVED_PATTERN_READ_ALL')";
+    String APPROVED_PATTERN_EDIT_ALL                = "hasAuthority('APPROVED_PATTERN_EDIT_ALL')";
+    String APPROVED_PATTERN_DELETE_ALL              = "hasAuthority('APPROVED_PATTERN_DELETE_ALL')";
+    /** USER */
+    String USER_READ                                = "hasAuthority('USER_READ')";
+    String USER_CREATE                              = "hasAuthority('USER_CREATE')";
+    String USER_EDIT                                = "hasAuthority('USER_EDIT')";
+    String USER_DELETE                              = "hasAuthority('USER_DELETE')";
+    String USER_READ_ALL                            = "hasAuthority('USER_READ_ALL')";
+    String USER_EDIT_ALL                            = "hasAuthority('USER_EDIT_ALL')";
+    String USER_DELETE_ALL                          = "hasAuthority('USER_DELETE_ALL')";
+    String USER_ALL                                 = "hasAuthority('USER_ALL')";
+    /** GENERAL */
+    String COMMENT                                  = "hasAuthority('COMMENT')";
+    String VOTE                                     = "hasAuthority('VOTE')";
+    String EVIDENCE                                 = "hasAuthority('EVIDENCE')";
+}

src/main/java/io/github/patternatlas/api/config/ResourceServerConfig.java

@@ -17,9 +17,9 @@
 
 @Configuration
 @EnableResourceServer
-// START::Comment for local development with authorization
+// START::Comment for local development without authorization
 //@EnableGlobalMethodSecurity(prePostEnabled = true)
-// END::Comment for local development with authorization
+// END::Comment for local development without authorization
 class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
     @Override
@@ -34,12 +34,12 @@ public void configure(HttpSecurity http) throws Exception {
 //                .antMatchers(HttpMethod.GET, "/**").permitAll()
 //                .antMatchers(HttpMethod.POST, "/**").access("#oauth2.hasScope('write')")
 //                .antMatchers(HttpMethod.PUT, "/**").access("#oauth2.hasScope('write')")
-//                .antMatchers(HttpMethod.DELETE, "/**").hasAuthority("ADMIN")
+//                .antMatchers(HttpMethod.DELETE, "/**").access("#oauth2.hasScope('delete')")
 //                .anyRequest().authenticated()
-                //END::Comment for local development with authorization
+                //END::Comment for local development without authorization
                 // START::Uncomment for local development without authorization
                 .anyRequest().permitAll()
-                // END::Uncomment for local development without authorization
+                // END::Uncomment for local development withoutout authorization
                 .and()
                 .sessionManagement()
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS);

src/main/java/io/github/patternatlas/api/entities/PatternGraph.java

@@ -11,6 +11,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.Objects;
+
 @Entity
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -21,4 +23,9 @@ public abstract class PatternGraph extends EntityWithURI {
     @Type(type = "jsonb")
     @Column(columnDefinition = "jsonb")
     private Object graph;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(graph);
+    }
 }

src/main/java/io/github/patternatlas/api/entities/PatternLanguage.java

@@ -45,4 +45,6 @@ public class PatternLanguage extends PatternGraph {
     @JsonIgnore
     @OneToMany(mappedBy = "patternLanguage", fetch = FetchType.LAZY)
     private List<UndirectedEdge> undirectedEdges;
+
+
 }

src/main/java/io/github/patternatlas/api/entities/PatternSchema.java

@@ -1,6 +1,7 @@
 package io.github.patternatlas.api.entities;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -33,4 +34,9 @@ public class PatternSchema {
     @OneToOne
     @MapsId
     private PatternLanguage patternLanguage;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, patternSectionSchemas);
+    }
 }

src/main/java/io/github/patternatlas/api/entities/candidate/Candidate.java

@@ -1,28 +1,27 @@
 package io.github.patternatlas.api.entities.candidate;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import io.github.patternatlas.api.entities.candidate.rating.CandidateRating;
-import io.github.patternatlas.api.entities.user.UserEntity;
-import io.github.patternatlas.api.rest.model.CandidateModel;
 import io.github.patternatlas.api.entities.EntityWithURI;
 import io.github.patternatlas.api.entities.PatternLanguage;
+import io.github.patternatlas.api.entities.candidate.author.CandidateAuthor;
+import io.github.patternatlas.api.entities.candidate.comment.CandidateComment;
+import io.github.patternatlas.api.entities.candidate.evidence.CandidateEvidence;
+import io.github.patternatlas.api.entities.issue.evidence.IssueEvidence;
+import io.github.patternatlas.api.rest.model.candidate.CandidateModelRequest;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import org.hibernate.annotations.Type;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.*;
+
 @Entity
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -36,15 +35,19 @@ public class Candidate extends EntityWithURI {
     @ManyToOne
     private PatternLanguage patternLanguage;
 
-    //    @Type(type = "jsonb")
-//    @Column(columnDefinition = "jsonb")
-//    @NotNull
-    private String content;
-
-    private int rating = 0;
+    @Type(type = "jsonb")
+    @Column(columnDefinition = "jsonb")
+    @NotNull
+    private Object content;
 
     private String version = "0.1.0";
 
+    private int rating;
+
+    @JsonIgnore
+    @OneToMany(mappedBy = "candidate", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CandidateAuthor> authors = new ArrayList<>();
+
     @JsonIgnore
     @OneToMany(mappedBy = "candidate", cascade = CascadeType.ALL, orphanRemoval = true)
     private Set<CandidateRating> userRating = new HashSet<>();
@@ -53,40 +56,31 @@ public class Candidate extends EntityWithURI {
     @OneToMany(mappedBy = "candidate", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CandidateComment> comments = new ArrayList<>();
 
-    public Candidate(CandidateModel candidateModel) {
-        this.setId(candidateModel.getId());
-        this.setUri(candidateModel.getUri());
-        this.setName(candidateModel.getName());
-        this.setIconUrl(candidateModel.getIconUrl());
-        //patternLanguage
-        this.setContent(candidateModel.getContent());
-        this.setVersion(candidateModel.getVersion());
-    }
-
-    public void addComment(CandidateComment comment, UserEntity user) {
-        comments.add(comment);
-        comment.setCandidate(this);
-        comment.setUser(user);
-    }
-
-    public void updateComment(CandidateComment updateComment) {
-        ListIterator<CandidateComment> commentIterator = comments.listIterator();
-        while (commentIterator.hasNext()) {
-            CandidateComment next = commentIterator.next();
-            if (next.getId().equals(updateComment.getId())) {
-                commentIterator.set(updateComment);
-                break;
-            }
-        }
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @OneToMany(mappedBy = "candidate", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CandidateEvidence> evidences = new ArrayList<>();
+
+    public Candidate (CandidateModelRequest candidateModelRequest) {
+//        this.setId(candidateModel.getId());
+        this.setUri(candidateModelRequest.getUri());
+        this.setName(candidateModelRequest.getName());
+        this.setIconUrl(candidateModelRequest.getIconUrl());
+        this.setContent(candidateModelRequest.getContent());
+        this.setVersion(candidateModelRequest.getVersion());
+        this.setRating(candidateModelRequest.getRating());
     }
 
-    public void removeComment(CandidateComment comment) {
-        comments.remove(comment);
-        comment.setCandidate(null);
-        comment.setUser(null);
+    public void updateCandidate(CandidateModelRequest candidateModelRequest) {
+        this.setId(candidateModelRequest.getId());
+        this.setUri(candidateModelRequest.getUri());
+        this.setName(candidateModelRequest.getName());
+        this.setIconUrl(candidateModelRequest.getIconUrl());
+        this.setContent(candidateModelRequest.getContent());
+        this.setVersion(candidateModelRequest.getVersion());
+        this.setRating(candidateModelRequest.getRating());
     }
 
     public String toString() {
         return this.getId().toString();
     }
-}
+}