Skip to content

Student refactoring #5

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

Merged
Charlie9077 merged 2 commits into from
Oct 11, 2022
Merged

Student refactoring #5

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
57930fc
Student Refactoring
Charlie9077 Oct 11, 2022
a24fa7d
Merge branch 'main' into StudentRefacotoring
Charlie9077 Oct 11, 2022
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
2 changes: 1 addition & 1 deletion ...kaiser/src/main/java/com/example/springKaiser/SOLID/OpenClosedPrinciple/BetterFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.springKaiser.SOLID.OpenClosedPrinciple;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.school.entities.Students;

import java.util.List;
import java.util.stream.Stream;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/example/springKaiser/SOLID/OpenClosedPrinciple/EmailSpecification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.springKaiser.SOLID.OpenClosedPrinciple;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.school.entities.Students;

public class EmailSpecification implements Specification<Students> {

Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/com/example/springKaiser/SOLID/OpenClosedPrinciple/NameSpecification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.springKaiser.SOLID.OpenClosedPrinciple;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.school.entities.Students;

public class NameSpecification implements Specification<Students> {

Expand Down
10 changes: 2 additions & 8 deletions backend/kaiser/src/main/java/com/example/springKaiser/YoutubeFeedManagerApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
package com.example.springKaiser;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.entities.Subscriber;
import com.example.springKaiser.entities.Video;
import com.example.springKaiser.repositories.*;
import com.example.springKaiser.school.Repository.GradeRepository;
import com.example.springKaiser.school.Repository.TeacherRepository;
import lombok.Builder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.context.annotation.Bean;

import java.util.stream.Stream;

@SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
@Builder
Expand Down
34 changes: 0 additions & 34 deletions backend/kaiser/src/main/java/com/example/springKaiser/business/student/StudentMapper.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions backend/kaiser/src/main/java/com/example/springKaiser/controller/SubscriberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.example.springKaiser.controller;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.entities.Subscriber;
import com.example.springKaiser.repositories.SubscriberRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
Expand Down
4 changes: 2 additions & 2 deletions ...gKaiser/repositories/GradeRepository.java → ...er/school/Repository/GradeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.springKaiser.repositories;
package com.example.springKaiser.school.Repository;

import com.example.springKaiser.entities.Grades;
import com.example.springKaiser.school.entities.Grades;
import org.springframework.data.jpa.repository.JpaRepository;

public interface GradeRepository extends JpaRepository<Grades, Integer> {
Expand Down
7 changes: 2 additions & 5 deletions ...iser/repositories/StudentsRepository.java → ...school/Repository/StudentsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package com.example.springKaiser.repositories;
package com.example.springKaiser.school.Repository;

import com.example.springKaiser.entities.Students;
import com.example.springKaiser.entities.Teachers;
import com.example.springKaiser.school.entities.Students;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

import java.util.List;
import java.util.Optional;

//Repositories manage the persisting (Saving) of data into our databases

Expand Down
4 changes: 2 additions & 2 deletions ...aiser/repositories/TeacherRepository.java → .../school/Repository/TeacherRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.springKaiser.repositories;
package com.example.springKaiser.school.Repository;

import com.example.springKaiser.entities.Teachers;
import com.example.springKaiser.school.entities.Teachers;
import org.springframework.data.jpa.repository.JpaRepository;

public interface TeacherRepository extends JpaRepository<Teachers, Integer> {
Expand Down
11 changes: 5 additions & 6 deletions ...Kaiser/controller/StudentsController.java → ...school/controller/StudentsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.example.springKaiser.controller;
package com.example.springKaiser.school.controller;

import com.example.springKaiser.business.student.StudentDto;
import com.example.springKaiser.business.student.StudentsService;
import com.example.springKaiser.entities.Students;
import com.example.springKaiser.repositories.StudentsRepository;
import com.example.springKaiser.school.student.StudentDto;
import com.example.springKaiser.school.student.StudentsService;
import com.example.springKaiser.school.entities.Students;
import com.example.springKaiser.school.Repository.StudentsRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.query.Param;
import org.springframework.web.bind.annotation.*;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...example/springKaiser/entities/Grades.java → .../springKaiser/school/entities/Grades.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.springKaiser.entities;
package com.example.springKaiser.school.entities;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
Expand Down
2 changes: 1 addition & 1 deletion ...ample/springKaiser/entities/Students.java → ...pringKaiser/school/entities/Students.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.springKaiser.entities;
package com.example.springKaiser.school.entities;

import jakarta.persistence.*;
import lombok.Data;
Expand Down
2 changes: 1 addition & 1 deletion ...ample/springKaiser/entities/Teachers.java → ...pringKaiser/school/entities/Teachers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.springKaiser.entities;
package com.example.springKaiser.school.entities;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion ...ngKaiser/business/student/StudentDto.java → ...ringKaiser/school/student/StudentDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.springKaiser.business.student;
package com.example.springKaiser.school.student;

public class StudentDto {

Expand Down
14 changes: 7 additions & 7 deletions ...ser/business/student/StudentsService.java → ...aiser/school/student/StudentsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.example.springKaiser.business.student;
package com.example.springKaiser.school.student;


import com.example.springKaiser.entities.Grades;
import com.example.springKaiser.entities.Students;
import com.example.springKaiser.entities.Teachers;
import com.example.springKaiser.repositories.GradeRepository;
import com.example.springKaiser.repositories.StudentsRepository;
import com.example.springKaiser.repositories.TeacherRepository;
import com.example.springKaiser.school.entities.Grades;
import com.example.springKaiser.school.entities.Students;
import com.example.springKaiser.school.entities.Teachers;
import com.example.springKaiser.school.Repository.GradeRepository;
import com.example.springKaiser.school.Repository.StudentsRepository;
import com.example.springKaiser.school.Repository.TeacherRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

Expand Down
6 changes: 1 addition & 5 deletions ...ample/springKaiser/SOLID/OpenClosedPrinciple/Service/StudentSpecificationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@

import com.example.springKaiser.SOLID.OpenClosedPrinciple.BetterFilter;
import com.example.springKaiser.SOLID.OpenClosedPrinciple.NameSpecification;
import com.example.springKaiser.entities.Students;
import com.example.springKaiser.school.entities.Students;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.mockito.Mockito.when;
import static org.junit.jupiter.api.Assertions.assertTrue;

import static org.junit.jupiter.api.Assertions.*;

class StudentSpecificationServiceTest {

@Test
Expand Down