Add filters for projects #14

L1mple · 2023-04-18T06:43:20Z

Pull request

SerjVankovich · 2023-04-18T07:47:23Z

docker-compose.yml

+      POSTGRES_PASSWORD: 1234
+      POSTGRES_DB: postgres
+    ports:
+      - 5440:5432


why did you add docker configuration? And how should app be launched now?

This is just the configuration for the database. If you don't want to use it, launching the application will be the same.

I added it because I don't want to touch the local database, so I created a docker file for this project. This is useful if you don't have postgres on your computer or don't want to touch it, it will be an isolated, clean database every time you run the container(but when app is launched seeding with liquibase still works for docker DB).

SerjVankovich · 2023-04-18T07:48:43Z

src/main/java/org/spburegistry/backend/service/ProjectService.java


 public interface ProjectService {
    Iterable<ProjectTO> findAll();
    ProjectTO findById(long id);
    ProjectTO addProject(ProjectRequestTO project);
+    List<ProjectTO> findProjectsBetweenDates(Date startDate, Date endDate);


Make return parameter Iterable<ProjectTO>

SerjVankovich

Fix comments

End-rey

You need to fix all the problems. It would also be very cool if you could tell me what filters you need in the end, point by point, and need to implement all of them to merge into the master later. At the moment I can't start the server

End-rey · 2023-04-18T08:11:22Z

src/main/java/org/spburegistry/backend/controller/ProjectController.java

-    @GetMapping
-    public Iterable<ProjectTO> getAllProjects() {
-        return projectService.findAll();
+    @GetMapping("/projects")


There is path /data/projects already in @RequestMapping and it will be added to all paths, so do not add /projects to your @GetMapping. Now your path looks like this: loacalhost:8080/data/projects/projects

End-rey · 2023-04-18T08:25:57Z

src/main/java/org/spburegistry/backend/controller/ProjectController.java

-        return projectService.findAll();
+    @GetMapping("/projects")
+    public List<ProjectTO> getProjectsBetweenDates(
+    @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,


If you delete get request with all project, most likely it should be that your query should output all projects if there are no parameters, but your parameters are required, and nowhere is it checked for their null. To do this, you can use Optional and in service check for null

End-rey · 2023-04-18T08:27:06Z

src/main/java/org/spburegistry/backend/controller/ProjectController.java

-    public Iterable<ProjectTO> getAllProjects() {
-        return projectService.findAll();
+    @GetMapping("/projects")
+    public List<ProjectTO> getProjectsBetweenDates(


You must do only filter by date?

End-rey · 2023-04-18T08:29:30Z

src/main/java/org/spburegistry/backend/repository/ProjectRepo.java

-
+
+    @Query("SELECT p FROM public.Project as p, Tag as pt WHERE pt.tag_id = :tagID AND p.id = pt.project_id AND p.start > :startDate AND (p.end IS NULL OR p.end <= :endDate)")
+    List<Project> findProjectsBetweenDates(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("tagID") Integer tagID);


Why you use here tagId and its Integer? And in the service, when you call this function, do not write any tagId, I get an error because of this

End-rey · 2023-04-18T08:31:13Z

src/main/java/org/spburegistry/backend/repository/ProjectRepo.java

-
+
+    @Query("SELECT p FROM public.Project as p, Tag as pt WHERE pt.tag_id = :tagID AND p.id = pt.project_id AND p.start > :startDate AND (p.end IS NULL OR p.end <= :endDate)")
+    List<Project> findProjectsBetweenDates(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("tagID") Integer tagID);


Also I could not start the server because the request was not written correctly

End-rey · 2023-04-18T08:32:40Z

src/main/java/org/spburegistry/backend/service/implementation/ProjectServiceImpl.java

@@ -72,6 +73,12 @@ public ProjectTO addProject(ProjectRequestTO projectRequest) {
        return ConvertToTO.projectToTO(project);
    }

+    @Override
+    public List<ProjectTO> findProjectsBetweenDates(java.util.Date startDate, java.util.Date endDate) {


You need to make java.util.Date import

End-rey · 2023-04-18T08:35:45Z

src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?useSSL=false
+spring.datasource.url=jdbc:postgresql://localhost:5440/postgres?useSSL=false


Why you change port? If you use a docker, it is better to keep it on your computer, so that there will be no problems when they merge the branch into the master

End-rey · 2023-04-18T08:36:54Z

src/main/resources/liquibase.properties

@@ -1,6 +1,6 @@
 classpath=
 changeLogfile=db/changelog/db.changelog-master.xml
-url=jdbc:postgresql://localhost:5432/postgres?useSSL=false
+url=jdbc:postgresql://localhost:5440/postgres?useSSL=false


Here the same problem as in src/main/resources/application.properties

MicAPic · 2023-05-02T16:11:52Z

@End-rey, @SerjVankovich, can you please help me resolve the 3rd merge conflict?

SerjVankovich · 2023-05-04T19:00:51Z

src/main/java/org/spburegistry/backend/controller/ProjectController.java

+            @RequestParam(required = false, defaultValue = "[]") List<String> tags_from_request,
+            @RequestParam(required = false, defaultValue = "[]") List<String> clinics_from_request) {
+        return projectService.getProjects(string_to_search, startDate, endDate, sorting_by_Date, tags_from_request,
+                clinics_from_request);


Consider to use camelCase instead of snake_case.

SerjVankovich · 2023-05-04T19:01:37Z

src/main/java/org/spburegistry/backend/repository/ProjectRepo.java


 public interface ProjectRepo extends JpaRepository<Project, Long> {
-
+
+    // WHERE cast(p.id as text) LIKE %:string_to_search%"'


Remove comment

End-rey · 2023-05-04T19:13:07Z

I don't know why, but when i search by first word in description it doesn't work

SerjVankovich · 2023-05-04T19:13:30Z

src/main/java/org/spburegistry/backend/repository/ProjectRepo.java

+            "CASE WHEN :sorting_by_Date = 'ASC' THEN p.start END ASC, " +
+            "CASE WHEN :sorting_by_Date = 'DESC' THEN p.start END DESC, " +
+            "CASE WHEN :sorting_by_Date = 'NULL' THEN NULL END")
+    // "AND (t.name IN (:tags_from_request)) ")


Remove comment

SerjVankovich · 2023-05-04T19:13:46Z

src/main/java/org/spburegistry/backend/service/implementation/ProjectServiceImpl.java

+    @Override
+    public Iterable<ProjectTO> getProjects(String string_to_search, Date startDate, Date endDate, Sort sorting_by_Date,
+            List<String> tags_from_request, List<String> clinics_from_request) {
+        // System.out.println(projectRepo.getProjectsByFilters());


Remove comment

End-rey · 2023-05-04T19:14:44Z

Search by supervisor does not work

End-rey · 2023-05-04T19:20:35Z

I think I figured out what the problem is. The search does not work if the word you want to find has a capital letter.

End-rey · 2023-05-04T19:35:50Z

The filter does not work when I enter a tag list:

PSQLException: ERROR: input of anonymous composite types is not implemented

SerjVankovich

Fix comments

End-rey · 2023-05-04T19:41:11Z

It is not very clear how the filter by date works. In theory, when I search by startDate should display projects exactly for the specified year and no more, the same with endDate - only projects that end in the specified year

Add basic setup

1729351

L1mple requested review from SerjVankovich, MicAPic and End-rey April 18, 2023 06:43

L1mple self-assigned this Apr 18, 2023

L1mple linked an issue Apr 18, 2023 that may be closed by this pull request

add filters #13

Closed

L1mple assigned KhabiKd Apr 18, 2023

SerjVankovich reviewed Apr 18, 2023

View reviewed changes

End-rey reviewed Apr 18, 2023

View reviewed changes

Add all filters except of status

c8f6a99

Merge branch 'master' into add-filters

6ec8b7f

SerjVankovich reviewed May 4, 2023

View reviewed changes

SerjVankovich requested changes May 4, 2023

View reviewed changes

KhabiKd and others added 2 commits May 15, 2023 19:59

replace snake_case with camelCase; comments removed; tag filter fixed

6d8b2fb

Merge branch 'master' into add-filters

f3ccc1c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add filters for projects #14

Add filters for projects #14

L1mple commented Apr 18, 2023 •

edited

Loading

SerjVankovich Apr 18, 2023

L1mple May 1, 2023

SerjVankovich Apr 18, 2023 •

edited

Loading

SerjVankovich left a comment

End-rey left a comment

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

End-rey Apr 18, 2023

MicAPic commented May 2, 2023

SerjVankovich May 4, 2023

SerjVankovich May 4, 2023

End-rey commented May 4, 2023

SerjVankovich May 4, 2023

SerjVankovich May 4, 2023

End-rey commented May 4, 2023

End-rey commented May 4, 2023 •

edited by SerjVankovich

Loading

End-rey commented May 4, 2023

SerjVankovich left a comment

End-rey commented May 4, 2023



		@Query("SELECT p FROM public.Project as p, Tag as pt WHERE pt.tag_id = :tagID AND p.id = pt.project_id AND p.start > :startDate AND (p.end IS NULL OR p.end <= :endDate)")
		List<Project> findProjectsBetweenDates(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("tagID") Integer tagID);

		@@ -1,4 +1,4 @@
		spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?useSSL=false
		spring.datasource.url=jdbc:postgresql://localhost:5440/postgres?useSSL=false


		public interface ProjectRepo extends JpaRepository<Project, Long> {


		// WHERE cast(p.id as text) LIKE %:string_to_search%"'

Add filters for projects #14

Are you sure you want to change the base?

Add filters for projects #14

Conversation

L1mple commented Apr 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerjVankovich Apr 18, 2023 • edited Loading

Choose a reason for hiding this comment

SerjVankovich left a comment

Choose a reason for hiding this comment

End-rey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MicAPic commented May 2, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

End-rey commented May 4, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

End-rey commented May 4, 2023

End-rey commented May 4, 2023 • edited by SerjVankovich Loading

End-rey commented May 4, 2023

SerjVankovich left a comment

Choose a reason for hiding this comment

End-rey commented May 4, 2023

L1mple commented Apr 18, 2023 •

edited

Loading

SerjVankovich Apr 18, 2023 •

edited

Loading

End-rey commented May 4, 2023 •

edited by SerjVankovich

Loading