Soft delete front end changes

.gitignore

@@ -3,6 +3,7 @@
 
 # Log file
 *.log
+*.iml
 
 # BlueJ files
 *.ctxt
@@ -76,4 +77,6 @@ baseline.json
 .history
 
 # Husky
-.husky/_
+.husky/_
+
+.angular

README.md

@@ -1,19 +1,32 @@
-# SocialServiceFinder
-My first commit
-
-#CORS Filter (Change the port number accordingly)
-@Bean
-public CorsFilter corsFilter() {
-CorsConfiguration corsConfiguration = new CorsConfiguration();
-corsConfiguration.setAllowCredentials(true);
-corsConfiguration.setAllowedOrigins(Arrays.asList("http://localhost:4202"));
-corsConfiguration.setAllowedHeaders(Arrays.asList("Origin", "Access-Control-Allow-Origin", "Content-Type",
-"Accept", "Authorization", "Origin, Accept", "X-Requested-With",
-"Access-Control-Request-Method", "Access-Control-Request-Headers"));
-corsConfiguration.setExposedHeaders(Arrays.asList("Origin", "Content-Type", "Accept", "Authorization",
-"Access-Control-Allow-Origin", "Access-Control-Allow-Origin", "Access-Control-Allow-Credentials"));
-corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
-UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
-urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
-return new CorsFilter(urlBasedCorsConfigurationSource);
-}
+## SocialServiceFinder
+
+### [Video Link](https://www.youtube.com/watch?v=DoI5_Ww7daA)
+
+### Abstract
+
+There are many people who would like to do community services, but don’t know the places that offer the opportunity for
+the same. Our project aims to provide a platform not only to people who seek non-profit organizations for any
+opportunities where they can contribute, but also to encourage more people by rewarding them for doing good deeds. We
+also plan on helping the organizations that are looking for volunteers to help them.
+
+We are planning to create a web platform that creates and manages volunteering opportunities (posted by social service
+organizations). Users can search for an opportunity based on various criterias like location, type of service required,
+type of organizations listing the opportunities, etc. For motivating the users, rewards from various partner companies
+will be offered to those who volunteer in these events. We are planning to implement a microservice based architecture
+using SOLID principles, and create a complete system with a reactive frontend, scalable backend software and a NOSQL
+database. For internal communication within the services, we will be using Messaging channels between them. We are
+focusing on microservice based architecture because we want to create a robust, maintainable and a highly scalable
+system in a way that makes it easy to add more features in the future, supporting Agile methodology. We are also
+planning to cover the features using functional tests.
+
+### Setup
+
+TO DO Add instructions to set up Elasticsearch
+
+#### Pre-reqs:
+
+1. Java
+2. Angular Cli
+3. MongoDb
+4. Git
+

eventservice/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.2</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.socialservicefinder</groupId>
+    <artifactId>eventservice</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>eventservice</name>
+    <description>Event Service Folder for Social Service Finder Project</description>
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-mongodb</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-elasticsearch -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-elasticsearch</artifactId>
+            <version>4.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.socialservicefinder</groupId>
+            <artifactId>userservice</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

eventservice/src/main/java/com/socialservicefinder/eventservice/EventServiceApplication.java

@@ -0,0 +1,36 @@
+package com.socialservicefinder.eventservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.Arrays;
+
+@SpringBootApplication
+@ComponentScan(basePackages = {"com.socialservicefinder.eventservice", "com.socialservicefinder.userservice"})
+public class EventServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(EventServiceApplication.class, args);
+    }
+
+    //CORS is some mechanism added by mordern browswers. just copy pasting. More Info: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    @Bean
+    public CorsFilter corsFilter1() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.setAllowCredentials(true);
+        corsConfiguration.setAllowedOrigins(Arrays.asList("http://localhost:4200"));
+        corsConfiguration.setAllowedHeaders(Arrays.asList("Origin", "Access-Control-Allow-Origin", "Content-Type",
+                "Accept", "Authorization", "Origin, Accept", "X-Requested-With",
+                "Access-Control-Request-Method", "Access-Control-Request-Headers"));
+        corsConfiguration.setExposedHeaders(Arrays.asList("Origin", "Content-Type", "Accept", "Authorization",
+                "Access-Control-Allow-Origin", "Access-Control-Allow-Origin", "Access-Control-Allow-Credentials"));
+        corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
+        UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(urlBasedCorsConfigurationSource);
+    }
+}

eventservice/src/main/java/com/socialservicefinder/eventservice/controller/EventController.java

@@ -0,0 +1,119 @@
+package com.socialservicefinder.eventservice.controller;
+
+import com.socialservicefinder.eventservice.dto.*;
+import com.socialservicefinder.eventservice.exceptions.InvalidEventException;
+import com.socialservicefinder.eventservice.service.EventLookUpService;
+import com.socialservicefinder.eventservice.service.EventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping(path = "api/v1/event")
+public class EventController {
+    private final EventService eventService;
+    private final EventLookUpService eventLookUpService;
+
+    @Autowired
+    public EventController(EventService eventService, EventLookUpService eventLookUpService) {
+        this.eventService = eventService;
+        this.eventLookUpService = eventLookUpService;
+    }
+
+    @GetMapping
+    public List<Event> getEvents() {
+        return eventService.getEvents();
+    }
+
+    @PostMapping
+    public ResponseEntity<String> addEvent(@RequestBody Event event) {
+        try {
+            eventService.addEvent(event);
+            return ResponseEntity.status(HttpStatus.OK).body(null);
+        } catch (InvalidEventException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
+    @PostMapping
+    @RequestMapping("/update/")
+    public ResponseEntity<String> updateEvent(@RequestBody Event event) {
+        try {
+            eventService.updateEvent(event);
+            return ResponseEntity.status(HttpStatus.OK).body(null);
+        } catch (InvalidEventException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
+    @PostMapping
+    @RequestMapping("/delete/")
+    public ResponseEntity<String> deleteEvent(@RequestBody Event event) {
+        try {
+            eventService.deleteEvent(event);
+            return ResponseEntity.status(HttpStatus.OK).body(null);
+        } catch (InvalidEventException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
+    @GetMapping
+    @RequestMapping("/search/")
+    public List<Event> getMatchingEvents(@RequestBody SearchQuery q) {
+        try {
+            if (q.getQuery().isEmpty()) {
+                return Collections.emptyList();
+            }
+            Page<EventLookUp> eventLookUps = eventLookUpService.findEventLookUpByEventInfoContaining(q.getQuery(), PageRequest.of(0, 10));
+            List<String> eventIds = new ArrayList<>();
+            eventLookUps.forEach(x -> eventIds.add(x.getEventId()));
+            List<Event> events = eventService.findEventsByIds(eventIds);
+            for (Event e : events) {
+                //Logging events coming from search
+                System.out.println(e.toString());
+            }
+            System.out.println("Query String:" + q.getQuery());
+            return events;
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @GetMapping
+    @RequestMapping("/fetchMyEvents/")
+    public List<Event> fetchMyEvents(@RequestBody FetchMyEvents f) {
+        try {
+            if (f.getId().length() == 0) {
+                return Collections.emptyList();
+            }
+            return eventService.fetchMyEvents(f.getId(), f.getIsOrganizer(), false);
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @PutMapping
+    @RequestMapping("/registerForEvent")
+    public ResponseEntity<String> registerUserForEvent(@RequestBody RegisterEvent eventToRegister){
+        try {
+            eventService.registerUserForEvent(eventToRegister);
+            return ResponseEntity.status(HttpStatus.OK).body(null);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
+}