Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added initial #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added initial #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ad0ee6
added initial
RonnieDipple Nov 11, 2019
7032fd8
Merge branch 'master' into Ronnie-Dipple
RonnieDipple Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 61 additions & 44 deletions usermodel - initial/src/main/java/com/lambdaschool/usermodel/SeedData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,24 @@
import com.github.javafaker.service.RandomService;
import com.lambdaschool.usermodel.models.Role;
import com.lambdaschool.usermodel.models.User;
import com.lambdaschool.usermodel.models.UserRoles;
import com.lambdaschool.usermodel.models.Useremail;
import com.lambdaschool.usermodel.services.RoleService;
import com.lambdaschool.usermodel.services.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Locale;

@Transactional
@Component
public class SeedData implements CommandLineRunner
{
@Autowired
RoleService roleService;

@Autowired
UserService userService;


@Override
public void run(String[] args) throws Exception
{
Expand All @@ -36,75 +33,95 @@ public void run(String[] args) throws Exception
r1 = roleService.save(r1);
r2 = roleService.save(r2);
r3 = roleService.save(r3);

// admin, data, user
ArrayList<UserRoles> admins = new ArrayList<>();
admins.add(new UserRoles(new User(),
r1));
admins.add(new UserRoles(new User(),
r2));
admins.add(new UserRoles(new User(),
r3));
User u1 = new User("admin",
"password",
"[email protected]");
"password",
"[email protected]",
admins);
u1.getUseremails()
.add(new Useremail(u1,
"[email protected]"));
.add(new Useremail(u1,
"[email protected]"));
u1.getUseremails()
.add(new Useremail(u1,
"[email protected]"));

.add(new Useremail(u1,
"[email protected]"));
userService.save(u1);

// data, user
ArrayList<UserRoles> datas = new ArrayList<>();
datas.add(new UserRoles(new User(),
r3));
datas.add(new UserRoles(new User(),
r2));
User u2 = new User("cinnamon",
"1234567",
"[email protected]");
"1234567",
"[email protected]",
datas);
u2.getUseremails()
.add(new Useremail(u2,
"[email protected]"));
.add(new Useremail(u2,
"[email protected]"));
u2.getUseremails()
.add(new Useremail(u2,
"[email protected]"));
.add(new Useremail(u2,
"[email protected]"));
u2.getUseremails()
.add(new Useremail(u2,
"[email protected]"));
.add(new Useremail(u2,
"[email protected]"));
userService.save(u2);

ArrayList<UserRoles> users = new ArrayList<>();
users.add(new UserRoles(new User(),
r2));
User u3 = new User("barnbarn",
"ILuvM4th!",
"[email protected]");
"ILuvM4th!",
"[email protected]",
users);
u3.getUseremails()
.add(new Useremail(u3,
"[email protected]"));
.add(new Useremail(u3,
"[email protected]"));
userService.save(u3);

users = new ArrayList<>();
users.add(new UserRoles(new User(),
r2));
User u4 = new User("puttat",
"password",
"[email protected]");
"password",
"[email protected]",
users);
userService.save(u4);

users = new ArrayList<>();
users.add(new UserRoles(new User(),
r2));
User u5 = new User("misskitty",
"password",
"[email protected]");
"password",
"[email protected]",
users);
userService.save(u5);

// using JavaFaker create a bunch of regular users
// https://www.baeldung.com/java-faker
// https://www.baeldung.com/regular-expressions-java

FakeValuesService fakeValuesService = new FakeValuesService(new Locale("en-US"),
new RandomService());
new RandomService());
Faker nameFaker = new Faker(new Locale("en-US"));

for (int i = 0; i < 100; i++)
{
new User();
User fakeUser;

users = new ArrayList<>();
users.add(new UserRoles(new User(),
r2));
fakeUser = new User(nameFaker.name()
.username(),
"password",
nameFaker.internet()
.emailAddress());
.username(),
"password",
nameFaker.internet()
.emailAddress(),
users);
fakeUser.getUseremails()
.add(new Useremail(fakeUser,
fakeValuesService.bothify("????##@gmail.com")));
fakeValuesService.bothify("????##@gmail.com")));
userService.save(fakeUser);
}
}
}
}
2 changes: 2 additions & 0 deletions usermodel - initial/src/main/java/com/lambdaschool/usermodel/UserModelApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@EnableJpaAuditing //Enables Auditabale
@SpringBootApplication
public class UserModelApplication
{
Expand Down
3 changes: 2 additions & 1 deletion ...odel - initial/src/main/java/com/lambdaschool/usermodel/config/H2ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.sql.SQLException;

// @Configuration
@Configuration
// taken from https://techdev.io/en/developer-blog/querying-the-embedded-h2-database-of-a-spring-boot-application
// necessary for using the database tool built into intellij
public class H2ServerConfiguration
Expand Down
15 changes: 11 additions & 4 deletions usermodel - initial/src/main/java/com/lambdaschool/usermodel/controllers/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ public ResponseEntity<?> deleteUserRoleByIds(
@PathVariable
long roleid)
{
// userService.deleteUserRole(userid,
// roleid);
userService.deleteUserRole(userid,
roleid);

return new ResponseEntity<>(HttpStatus.OK);
}
Expand All @@ -187,9 +187,16 @@ public ResponseEntity<?> postUserRoleByIds(
@PathVariable
long roleid)
{
// userService.addUserRole(userid,
// roleid);
userService.addUserRole(userid,
roleid);

return new ResponseEntity<>(HttpStatus.CREATED);
}

//http://localhost:2019/users/user/email/count //gives list of user emails
@GetMapping(value = "/user/email/count", produces = {"application/json"})
public ResponseEntity<?> getNumUserEmails()
{
return new ResponseEntity<>(userService.getCountUserEmails(), HttpStatus.OK);
}
}
2 changes: 1 addition & 1 deletion ...l - initial/src/main/java/com/lambdaschool/usermodel/controllers/UseremailController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ public ResponseEntity<?> updateUserEmail(
return new ResponseEntity<>(HttpStatus.OK);
}

// note emails are added through the user process
// note emails are added through the usercontroller process
}
32 changes: 32 additions & 0 deletions usermodel - initial/src/main/java/com/lambdaschool/usermodel/models/Auditable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.lambdaschool.usermodel.models;

import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date;


@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)//runs in background when something happens it makes changes in background
abstract class Auditable
{
@CreatedBy
protected String createdby;
@CreatedDate
@Temporal(TemporalType.TIMESTAMP)//adds time to date
protected Date createddate;
@LastModifiedBy
protected String lastmodifiedby;
@LastModifiedDate
@Temporal(TemporalType.TIMESTAMP)
protected Date lastmodifieddate;

}
22 changes: 20 additions & 2 deletions usermodel - initial/src/main/java/com/lambdaschool/usermodel/models/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.lambdaschool.usermodel.models;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.hibernate.validator.constraints.EAN;

import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;

@Entity
@Table(name = "roles")
public class Role
public class Role extends Auditable
{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
Expand All @@ -14,6 +19,11 @@ public class Role
unique = true)
private String name;

@OneToMany(mappedBy = "role",
cascade = CascadeType.ALL)
@JsonIgnoreProperties("role")
private List<UserRoles> userroles = new ArrayList<>();

public Role()
{
}
Expand All @@ -35,7 +45,7 @@ public void setRoleid(long roleid)

public String getName()
{
if (name == null)
if (name == null) // possible to not have a name when doing an update, so check is neccessary
{
return null;
} else
Expand All @@ -48,4 +58,12 @@ public void setName(String name)
{
this.name = name.toUpperCase();
}

public List<UserRoles> getUserroles() {
return userroles;
}

public void setUserroles(List<UserRoles> userroles) {
this.userroles = userroles;
}
}
Loading