Skip to content

Commit 9f40e64

Browse files
playjimplayjim
authored
Merge pull request #54 from Java-Java-Bootcamp/refactor
Refactor
2 parents 7d21e12 + 521aa95 commit 9f40e64

61 files changed

Lines changed: 514 additions & 452 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.idea
2+
.idea/*
3+
/.idea/

backend/src/main/java/com/booking/backend/controller/OrganizationController.java renamed to backend/src/main/java/com/booking/backend/controllers/OrganizationController.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.booking.backend.controller;
1+
package com.booking.backend.controllers;
22

33

4-
import com.booking.backend.dto.OrganizationDto;
5-
import com.booking.backend.entity.TypeOrganization;
6-
import com.booking.backend.service.OrganizationService;
4+
import com.booking.backend.entities.TypeOrganization;
5+
import com.booking.backend.usecases.OrganizationDto;
6+
import com.booking.backend.usecases.OrganizationService;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.data.domain.Page;
99
import org.springframework.data.domain.Pageable;
@@ -18,18 +18,18 @@ public class OrganizationController {
1818
private final OrganizationService organizationService;
1919

2020
@GetMapping("/organization")
21-
Page<OrganizationDto> getAllOrganizations(Pageable pageable) {
21+
Page<OrganizationDto> findAll(Pageable pageable) {
2222
return organizationService.getAllOrganizations(pageable);
2323
}
2424

2525
@GetMapping("/organization/type/{type}")
26-
Page<OrganizationDto> getAllOrganizationsByType(@PathVariable TypeOrganization type,
27-
Pageable pageable) {
26+
Page<OrganizationDto> findAllByType(@PathVariable TypeOrganization type,
27+
Pageable pageable) {
2828
return organizationService.getOrganizationsByType(pageable, type);
2929
}
3030

3131
@GetMapping("/organization/type")
32-
List<TypeOrganization> getAllTypesOrganizations() {
32+
List<TypeOrganization> findAllTypes() {
3333
return organizationService.getAllTypesOrganizations();
3434
}
3535

backend/src/main/java/com/booking/backend/controller/PersonController.java renamed to backend/src/main/java/com/booking/backend/controllers/PersonController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.booking.backend.controller;
1+
package com.booking.backend.controllers;
22

3-
import com.booking.backend.dto.PersonDto;
4-
import com.booking.backend.service.PersonService;
3+
import com.booking.backend.usecases.PersonDto;
4+
import com.booking.backend.usecases.PersonService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.web.bind.annotation.*;
77

backend/src/main/java/com/booking/backend/controller/ReservationController.java renamed to backend/src/main/java/com/booking/backend/controllers/ReservationController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.booking.backend.controller;
1+
package com.booking.backend.controllers;
22

3-
import com.booking.backend.dto.ReservationDto;
4-
import com.booking.backend.service.ReservationService;
3+
import com.booking.backend.usecases.ReservationDto;
4+
import com.booking.backend.usecases.ReservationService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.web.bind.annotation.PostMapping;
77
import org.springframework.web.bind.annotation.RequestBody;

backend/src/main/java/com/booking/backend/entity/Booking.java renamed to backend/src/main/java/com/booking/backend/entities/Booking.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.booking.backend.entity;
1+
package com.booking.backend.entities;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Getter;

backend/src/main/java/com/booking/backend/repository/BookingRepository.java renamed to backend/src/main/java/com/booking/backend/entities/BookingRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.booking.backend.repository;
1+
package com.booking.backend.entities;
22

3-
import com.booking.backend.entity.Booking;
43
import org.springframework.data.jpa.repository.JpaRepository;
54

65
public interface BookingRepository extends JpaRepository<Booking, Long> {

backend/src/main/java/com/booking/backend/entity/Organization.java renamed to backend/src/main/java/com/booking/backend/entities/Organization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.booking.backend.entity;
1+
package com.booking.backend.entities;
22

33

44
import lombok.AllArgsConstructor;

backend/src/main/java/com/booking/backend/repository/OrganizationRepository.java renamed to backend/src/main/java/com/booking/backend/entities/OrganizationRepository.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package com.booking.backend.repository;
1+
package com.booking.backend.entities;
22

3-
import com.booking.backend.entity.Organization;
4-
import com.booking.backend.entity.TypeOrganization;
53
import org.springframework.data.domain.Page;
64
import org.springframework.data.domain.Pageable;
75
import org.springframework.data.jpa.repository.JpaRepository;

backend/src/main/java/com/booking/backend/entity/Person.java renamed to backend/src/main/java/com/booking/backend/entities/Person.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.booking.backend.entity;
1+
package com.booking.backend.entities;
22

33

44
import lombok.AllArgsConstructor;

backend/src/main/java/com/booking/backend/repository/PersonRepository.java renamed to backend/src/main/java/com/booking/backend/entities/PersonRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.booking.backend.repository;
1+
package com.booking.backend.entities;
22

3-
import com.booking.backend.entity.Person;
43
import org.springframework.data.jpa.repository.JpaRepository;
54

65
public interface PersonRepository extends JpaRepository<Person, Long> {

0 commit comments

Comments
 (0)