Merge branch 'dev'

teapot-org · Jun 26, 2017 · 3660326 · 3660326
2 parents d9ab6ca + c336609
commit 3660326
Show file tree

Hide file tree

Showing 41 changed files with 1,845 additions and 128 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.teapot</groupId>
   <artifactId>teapot-backend</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0</version>
   <packaging>jar</packaging>
 
   <parent>

diff --git a/src/main/java/org/teapot/backend/config/DevelopmentProfileConfig.java b/src/main/java/org/teapot/backend/config/DevelopmentProfileConfig.java
@@ -11,16 +11,20 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.teapot.backend.model.meta.TeapotAction;
 import org.teapot.backend.model.meta.TeapotProperty;
-import org.teapot.backend.model.User;
-import org.teapot.backend.model.UserAuthority;
 import org.teapot.backend.model.meta.TeapotResource;
-import org.teapot.backend.repository.TeapotActionRepository;
-import org.teapot.backend.repository.TeapotPropertyRepository;
-import org.teapot.backend.repository.TeapotResourceRepository;
-import org.teapot.backend.repository.UserRepository;
+import org.teapot.backend.model.organization.Member;
+import org.teapot.backend.model.organization.MemberStatus;
+import org.teapot.backend.model.organization.Organization;
+import org.teapot.backend.model.user.User;
+import org.teapot.backend.model.user.UserAuthority;
+import org.teapot.backend.repository.meta.TeapotActionRepository;
+import org.teapot.backend.repository.meta.TeapotPropertyRepository;
+import org.teapot.backend.repository.meta.TeapotResourceRepository;
+import org.teapot.backend.repository.organization.MemberRepository;
+import org.teapot.backend.repository.organization.OrganizationRepository;
+import org.teapot.backend.repository.user.UserRepository;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Arrays;
 
 
@@ -43,6 +47,12 @@ public class DevelopmentProfileConfig {
     @Autowired
     private PasswordEncoder passwordEncoder;
 
+    @Autowired
+    private OrganizationRepository organizationRepository;
+
+    @Autowired
+    private MemberRepository memberRepository;
+
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -70,6 +80,8 @@ public CommandLineRunner loadData() {
             addProperties();
             addResources();
             addActions();
+            addOrganizations();
+            addMembers();
         };
     }
 
@@ -82,7 +94,7 @@ private void registerAdmin() {
         admin.setActivated(true);
         admin.setFirstName("Cake");
         admin.setLastName("Lover");
-        admin.setRegistrationDate(LocalDateTime.now());
+        admin.setRegistrationDate(LocalDate.now());
         admin.setBirthday(LocalDate.now());
         admin.setDescription("i manage everything");
         admin.setAuthority(UserAuthority.ADMIN);
@@ -99,7 +111,7 @@ private void registerDaleCooper() {
         user.setActivated(true);
         user.setFirstName("Dale");
         user.setLastName("Cooper");
-        user.setRegistrationDate(LocalDateTime.now());
+        user.setRegistrationDate(LocalDate.now());
         user.setBirthday(LocalDate.now());
         user.setDescription("a special FBI agent");
         user.setAuthority(UserAuthority.USER);
@@ -116,7 +128,7 @@ private void registerLoraPalmer() {
         user.setActivated(true);
         user.setFirstName("Lora");
         user.setLastName("Palmer");
-        user.setRegistrationDate(LocalDateTime.now());
+        user.setRegistrationDate(LocalDate.now());
         user.setBirthday(LocalDate.now());
         user.setDescription("a dead girl");
         user.setAuthority(UserAuthority.USER);
@@ -133,7 +145,7 @@ private void registerSherlockHolmes() {
         user.setActivated(true);
         user.setFirstName("Sherlock");
         user.setLastName("Holmes");
-        user.setRegistrationDate(LocalDateTime.now());
+        user.setRegistrationDate(LocalDate.now());
         user.setBirthday(LocalDate.now());
         user.setDescription("private detective");
         user.setAuthority(UserAuthority.USER);
@@ -150,7 +162,7 @@ private void registerDoctorWatson() {
         user.setActivated(true);
         user.setFirstName("John");
         user.setLastName("Watson");
-        user.setRegistrationDate(LocalDateTime.now());
+        user.setRegistrationDate(LocalDate.now());
         user.setBirthday(LocalDate.now());
         user.setDescription("Sherlock Holmes' mate");
         user.setAuthority(UserAuthority.USER);
@@ -166,7 +178,7 @@ private void addProperties() {
         property1.setValue("1");
 
         property2.setName("site-uri");
-        property2.setValue("localhost:8080");
+        property2.setValue("http://localhost:8080");
 
         propertyRepository.save(property1);
         propertyRepository.save(property2);
@@ -196,4 +208,46 @@ private void addActions() {
 
         actionRepository.save(Arrays.asList(action1, action2));
     }
+
+    private void addOrganizations() {
+        Organization teapot = new Organization();
+        teapot.setName("teapot");
+        teapot.setCreationDate(LocalDate.now());
+        organizationRepository.save(teapot);
+
+        Organization someOrganization = new Organization();
+        someOrganization.setName("someOrganization");
+        someOrganization.setCreationDate(LocalDate.now());
+        organizationRepository.save(someOrganization);
+    }
+
+    private void addMembers() {
+        Member member1 = new Member();
+        member1.setAdmissionDate(LocalDate.now());
+        member1.setOrganization(organizationRepository.findByName("teapot"));
+        member1.setUser(userRepository.findByUsername("dr_watson"));
+        member1.setStatus(MemberStatus.CREATOR);
+        memberRepository.save(member1);
+
+        Member member2 = new Member();
+        member2.setAdmissionDate(LocalDate.now());
+        member2.setOrganization(organizationRepository.findByName("teapot"));
+        member2.setUser(userRepository.findByUsername("lora_palmer"));
+        member2.setStatus(MemberStatus.WORKER);
+        memberRepository.save(member2);
+
+        Member member3 = new Member();
+        member3.setAdmissionDate(LocalDate.now());
+        member3.setOrganization(organizationRepository.findByName("someOrganization"));
+        member3.setUser(userRepository.findByUsername("dale_cooper"));
+        member3.setStatus(MemberStatus.CREATOR);
+        memberRepository.save(member3);
+
+        Member member4 = new Member();
+        member4.setAdmissionDate(LocalDate.now());
+        member4.setOrganization(organizationRepository.findByName("someOrganization"));
+        member4.setUser(userRepository.findByUsername("sherlock_holmes"));
+        member4.setStatus(MemberStatus.OWNER);
+        memberRepository.save(member4);
+    }
 }
diff --git a/src/main/java/org/teapot/backend/config/security/AuthorizationServerConfig.java b/src/main/java/org/teapot/backend/config/security/AuthorizationServerConfig.java
@@ -2,7 +2,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
@@ -14,7 +13,6 @@
 
 @Configuration
 @EnableAuthorizationServer
-@Profile("security")
 public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter {
 
     @Autowired

diff --git a/src/main/java/org/teapot/backend/config/security/DefaultProfileWebSecurityConfig.java b/src/main/java/org/teapot/backend/config/security/DefaultProfileWebSecurityConfig.java
diff --git a/src/main/java/org/teapot/backend/config/security/ResourceServerConfig.java b/src/main/java/org/teapot/backend/config/security/ResourceServerConfig.java
@@ -2,7 +2,6 @@
 
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
@@ -12,7 +11,6 @@
 
 @Configuration
 @EnableResourceServer
-@Profile("security")
 @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER - 1)
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 

diff --git a/...ity/SecurityProfileWebSecurityConfig.java → ...nd/config/security/WebSecurityConfig.java b/...ity/SecurityProfileWebSecurityConfig.java → ...nd/config/security/WebSecurityConfig.java
@@ -3,7 +3,6 @@
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -15,11 +14,10 @@
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-@Profile("security")
 @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
-public class SecurityProfileWebSecurityConfig extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
-    public SecurityProfileWebSecurityConfig() {
+    public WebSecurityConfig() {
         super(true);
     }
 

diff --git a/...nd/controller/TeapotActionController.java → ...ntroller/meta/TeapotActionController.java b/...nd/controller/TeapotActionController.java → ...ntroller/meta/TeapotActionController.java
@@ -1,4 +1,4 @@
-package org.teapot.backend.controller;
+package org.teapot.backend.controller.meta;
 
 import com.google.common.primitives.Longs;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,13 +7,13 @@
 import org.teapot.backend.controller.exception.BadRequestException;
 import org.teapot.backend.controller.exception.ConflictException;
 import org.teapot.backend.controller.exception.ResourceNotFoundException;
-import org.teapot.backend.model.User;
-import org.teapot.backend.model.VerificationToken;
+import org.teapot.backend.model.user.User;
+import org.teapot.backend.model.user.VerificationToken;
 import org.teapot.backend.model.meta.TeapotAction;
-import org.teapot.backend.repository.TeapotActionRepository;
-import org.teapot.backend.repository.TeapotResourceRepository;
-import org.teapot.backend.repository.UserRepository;
-import org.teapot.backend.repository.VerificationTokenRepository;
+import org.teapot.backend.repository.meta.TeapotActionRepository;
+import org.teapot.backend.repository.meta.TeapotResourceRepository;
+import org.teapot.backend.repository.user.UserRepository;
+import org.teapot.backend.repository.user.VerificationTokenRepository;
 import org.teapot.backend.util.VerificationMailSender;
 
 import java.time.LocalDateTime;

diff --git a/.../controller/TeapotPropertyController.java → ...roller/meta/TeapotPropertyController.java b/.../controller/TeapotPropertyController.java → ...roller/meta/TeapotPropertyController.java
@@ -1,4 +1,4 @@
-package org.teapot.backend.controller;
+package org.teapot.backend.controller.meta;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -7,7 +7,7 @@
 import org.teapot.backend.controller.exception.BadRequestException;
 import org.teapot.backend.controller.exception.ResourceNotFoundException;
 import org.teapot.backend.model.meta.TeapotProperty;
-import org.teapot.backend.repository.TeapotPropertyRepository;
+import org.teapot.backend.repository.meta.TeapotPropertyRepository;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

diff --git a/.../controller/TeapotResourceController.java → ...roller/meta/TeapotResourceController.java b/.../controller/TeapotResourceController.java → ...roller/meta/TeapotResourceController.java
@@ -1,4 +1,4 @@
-package org.teapot.backend.controller;
+package org.teapot.backend.controller.meta;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -7,7 +7,7 @@
 import org.teapot.backend.controller.exception.BadRequestException;
 import org.teapot.backend.controller.exception.ResourceNotFoundException;
 import org.teapot.backend.model.meta.TeapotResource;
-import org.teapot.backend.repository.TeapotResourceRepository;
+import org.teapot.backend.repository.meta.TeapotResourceRepository;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;