Skip to content

Added some dependencies #13

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

@SpringBootApplication
@EnableJpaAuditing
@EntityScan(basePackages = "com.example.postgresdemo")
@ComponentScan(basePackages = "com.example.postgresdemo")
@EnableJpaRepositories(basePackages = "com.example.postgresdemo")
public class PostgresDemoApplication {
public static void main(String[] args) {
SpringApplication.run(PostgresDemoApplication.class, args);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public class AnswerController {
private QuestionRepository questionRepository;

@GetMapping("/questions/{questionId}/answers")
public List<Answer> getAnswersByQuestionId(@PathVariable Long questionId) {
public List<Answer> getAnswersByQuestionId(@PathVariable(value = "questionId") Long questionId) {
return answerRepository.findByQuestionId(questionId);
}

@PostMapping("/questions/{questionId}/answers")
public Answer addAnswer(@PathVariable Long questionId,
public Answer addAnswer(@PathVariable(value = "questionId") Long questionId,
@Valid @RequestBody Answer answer) {
return questionRepository.findById(questionId)
.map(question -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,24 @@
import javax.validation.Valid;

@RestController
@RequestMapping("/questions")
public class QuestionController {

@Autowired
private QuestionRepository questionRepository;

@GetMapping("/questions")
@GetMapping("/list")
public Page<Question> getQuestions(Pageable pageable) {
return questionRepository.findAll(pageable);
}


@PostMapping("/questions")
@PostMapping("/create")
public Question createQuestion(@Valid @RequestBody Question question) {
return questionRepository.save(question);
}

@PutMapping("/questions/{questionId}")
@PutMapping("/{questionId}")
public Question updateQuestion(@PathVariable Long questionId,
@Valid @RequestBody Question questionRequest) {
return questionRepository.findById(questionId)
Expand All @@ -39,10 +40,10 @@ public Question updateQuestion(@PathVariable Long questionId,
}


@DeleteMapping("/questions/{questionId}")
@DeleteMapping("/{questionId}")
public ResponseEntity<?> deleteQuestion(@PathVariable Long questionId) {
return questionRepository.findById(questionId)
.map(question -> {
.map(question -> {
questionRepository.delete(question);
return ResponseEntity.ok().build();
}).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
Expand Down
34 changes: 11 additions & 23 deletions src/main/java/com/example/postgresdemo/model/Answer.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
package com.example.postgresdemo.model;

import com.fasterxml.jackson.annotation.JsonIgnore;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;

import javax.persistence.*;

@Entity
@Table(name = "answers")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class Answer extends AuditModel {
@Id
@GeneratedValue(generator = "answer_generator")
Expand All @@ -27,27 +37,5 @@ public class Answer extends AuditModel {
@JsonIgnore
private Question question;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getText() {
return text;
}

public void setText(String text) {
this.text = text;
}

public Question getQuestion() {
return question;
}

public void setQuestion(Question question) {
this.question = question;
}

}
23 changes: 7 additions & 16 deletions src/main/java/com/example/postgresdemo/model/AuditModel.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
package com.example.postgresdemo.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Getter;
import lombok.Setter;

import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

@Getter
@Setter
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
@JsonIgnoreProperties(
Expand All @@ -25,19 +30,5 @@ public abstract class AuditModel implements Serializable {
@LastModifiedDate
private Date updatedAt;

public Date getCreatedAt() {
return createdAt;
}

public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}

public Date getUpdatedAt() {
return updatedAt;
}

public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}

}
32 changes: 9 additions & 23 deletions src/main/java/com/example/postgresdemo/model/Question.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Entity
@Table(name = "questions")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class Question extends AuditModel {
@Id
@GeneratedValue(generator = "question_generator")
Expand All @@ -23,27 +32,4 @@ public class Question extends AuditModel {
@Column(columnDefinition = "text")
private String description;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@

@Repository
public interface AnswerRepository extends JpaRepository<Answer, Long> {
List<Answer> findByQuestionId(Long questionId);

List<Answer> findByQuestionId(Long questionId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@

@Repository
public interface QuestionRepository extends JpaRepository<Question, Long> {

}
19 changes: 15 additions & 4 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
spring.datasource.url=jdbc:postgresql://localhost:5432/postgres_demo
spring.datasource.username= postgres
spring.datasource.password=
spring.datasource.url=jdbc:postgresql://localhost:5432/postgres

spring.datasource.password=1

# The SQL dialect makes Hibernate generate better SQL for the chosen database
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect

# Hibernate ddl auto (create, create-drop, validate, update)
spring.jpa.hibernate.ddl-auto = update
spring.jpa.hibernate.ddl-auto = create


spring.application.name=postgres-demo


spring.datasource.username=postgres
spring.jpa.properties.hibernate.default_schema=posgresdemo


spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true