Skip to content

Commit 92a392d

Browse files
committed
app builds successfully
1 parent 5c28647 commit 92a392d

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

lesson_25/db/db_app/src/main/java/com/codedifferently/lesson25/factory/LibraryDbDataLoader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import com.codedifferently.lesson25.models.LibraryDataModel;
44
import com.codedifferently.lesson25.repository.LibraryGuestRepository;
5+
import com.codedifferently.lesson25.repository.LibraryUserRepository;
56
import com.codedifferently.lesson25.repository.MediaItemRepository;
6-
7-
import main.java.com.codedifferently.lesson25.repository.LibraryUserRepository;
8-
97
import java.io.IOException;
108
import org.springframework.beans.factory.annotation.Autowired;
119
import org.springframework.stereotype.Service;

lesson_25/db/db_app/src/main/java/com/codedifferently/lesson25/models/LibraryDataModel.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
import com.codedifferently.lesson25.library.MediaItem;
99
import com.codedifferently.lesson25.library.Newspaper;
1010
import com.codedifferently.lesson25.library.Patron;
11-
12-
import main.java.com.codedifferently.lesson25.models.LibraryUserModel;
13-
1411
import java.util.ArrayList;
1512
import java.util.HashMap;
1613
import java.util.List;
@@ -20,6 +17,7 @@ public class LibraryDataModel {
2017

2118
public List<MediaItemModel> mediaItems;
2219
public List<LibraryGuestModel> guests;
20+
public List<LibraryUserModel> users;
2321

2422
public List<MediaItem> getMediaItems() {
2523
List<MediaItem> results = new ArrayList<>();
@@ -63,8 +61,6 @@ public Map<String, List<CheckoutModel>> getCheckoutsByEmail() {
6361
return results;
6462
}
6563

66-
public List<LibraryUserModel> users;
67-
6864
public List<LibraryUserModel> getUsers() {
6965
return users;
7066
}

lesson_25/db/db_app/src/main/java/com/codedifferently/lesson25/models/LibraryGuestModel.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.codedifferently.lesson25.models;
22

3-
import java.util.List;
4-
53
import jakarta.persistence.Entity;
64
import jakarta.persistence.FetchType;
75
import jakarta.persistence.Id;
86
import jakarta.persistence.OneToMany;
97
import jakarta.persistence.Table;
8+
import java.util.List;
109

1110
@Entity
1211
@Table(name = "guests")
@@ -19,4 +18,3 @@ public class LibraryGuestModel {
1918
@OneToMany(mappedBy = "email", fetch = FetchType.EAGER)
2019
public List<CheckoutModel> checkedOutItems;
2120
}
22-

lesson_25/db/db_app/src/main/java/com/codedifferently/lesson25/models/LibraryUserModel.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
@Entity
88
@Table(name = "library_users")
99
public class LibraryUserModel {
10-
@Id public String id;
11-
public String email;
12-
public String firstName;
13-
public String lastName;
14-
public String password;
10+
@Id public String id;
11+
public String email;
12+
public String firstName;
13+
public String lastName;
14+
public String password;
1515
}
16-
17-

lesson_25/db/db_app/src/main/java/com/codedifferently/lesson25/repository/LibraryUserRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import com.codedifferently.lesson25.models.LibraryUserModel;
44
import java.util.List;
5-
import java.util.UUID;
65
import org.springframework.data.repository.CrudRepository;
76

87
public interface LibraryUserRepository extends CrudRepository<LibraryUserModel, String> {
9-
108
@Override
119
List<LibraryUserModel> findAll();
1210
}

0 commit comments

Comments
 (0)