Merge pull request #313 from COS301-SE-2023/dev

User Release

Author: PaulPilane

.github/workflows/cd-dev.yml

@@ -41,6 +41,9 @@ jobs:
         printf "${{ secrets.ENV_FILE }}" > .env
       shell: bash
 
+    - name: Setup NX
+      run: npm install nx@latest
+
     - name: Install Dependencies
       run: npm install
 
@@ -88,12 +91,6 @@ jobs:
       - name: Setup NX
         run: npm install nx@latest
 
-      - name: Setup Enviroment Files
-        run: |
-          printf "${{ secrets.API_APPLICATION_PROPERTIES }}" > apps/api/src/main/resources/application.properties
-          cat apps/api/src/main/resources/application.properties
-        shell: bash
-
       - name: Build API
         run: npm run build:api
 

.github/workflows/ci-dev.yml

@@ -38,12 +38,6 @@ jobs:
     - name: Install Dependencies
       run: npm install
 
-    - name: Setup Enviroment Files
-      run: |
-        printf "${{ secrets.API_APPLICATION_PROPERTIES }}" > apps/api/src/main/resources/application.properties
-        cat apps/api/src/main/resources/application.properties
-      shell: bash
-
     - name: Lint App
       run: npx nx run app:lint
 
@@ -57,11 +51,11 @@ jobs:
       with:
         files: coverage/lcov.info  
 
-    - name: e2e Test App
-      run: npm run e2e:app:test
-      
     - name: Build App
       run: npm run build:app:dev
+
+    - name: e2e Test App
+      run: npm run e2e:app:test
 
     - name: Build API
       run: npm run build:api

.github/workflows/ci-prod.yml

@@ -34,12 +34,6 @@ jobs:
     - name: Install Dependencies
       run: npm install
 
-    - name: Setup Enviroment Files
-      run: |
-        printf "${{ secrets.API_APPLICATION_PROPERTIES }}" > apps/api/src/main/resources/application.properties
-        cat apps/api/src/main/resources/application.properties
-      shell: bash
-
     - name: Lint App
       run: npx nx run app:lint
 
@@ -52,12 +46,12 @@ jobs:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
         files: coverage/lcov.info  
-
-    - name: e2e Test App
-      run: npm run e2e:app:test
 
     - name: Build App
       run: npm run build:app:prod
+
+    - name: e2e Test App
+      run: npm run e2e:app:test
 
     - name: Build API
       run: npm run build:api

apps/api/build.gradle

@@ -19,6 +19,10 @@ dependencies {
 	implementation 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
 	implementation 'org.springframework.boot:spring-boot-starter-graphql'
+  implementation 'nl.martijndwars:web-push:5.1.1'
+  implementation 'name.neuhalfen.projects.crypto.bouncycastle.openpgp:bouncy-gpg:2.3.0'
+  implementation 'org.springframework.boot:spring-boot-starter-websocket'
+  testImplementation 'org.awaitility:awaitility:3.1.2'
 }
 
 tasks.named('test') {
@@ -27,4 +31,4 @@ tasks.named('test') {
 
 jar {
     enabled = false
-}
+}

apps/api/src/main/java/com/fridgetoplate/api/ApiApplication.java

@@ -5,8 +5,10 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
+@EnableScheduling
 @SpringBootApplication
 @ComponentScan("com.fridgetoplate")
 public class ApiApplication {
@@ -15,8 +17,8 @@ public static void main(String[] args) {
 		SpringApplication.run(ApiApplication.class, args);
 	}
 
-	@Bean
-	public RestTemplate restTemplate(RestTemplateBuilder builder) {
+    @Bean
+    RestTemplate restTemplate(RestTemplateBuilder builder) {
 		return builder.build();
 	}
 

apps/api/src/main/java/com/fridgetoplate/config/DynamoDBConfiguration.java

@@ -7,6 +7,8 @@
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.document.DynamoDB;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -28,6 +30,11 @@ public DynamoDBMapper dynamoDBMapper() {
         return new DynamoDBMapper(buildAmazonDynamoDB());
     }
 
+    @Bean
+    public DynamoDB dynamodb(){
+        return new DynamoDB(buildAmazonDynamoDB());
+    }
+
     private AmazonDynamoDB buildAmazonDynamoDB() {
         return AmazonDynamoDBClientBuilder
                 .standard()

apps/api/src/main/java/com/fridgetoplate/config/WebSocketConfig.java

@@ -0,0 +1,26 @@
+package com.fridgetoplate.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+        config.enableSimpleBroker("/all", "/specific");
+        config.setApplicationDestinationPrefixes("/app");
+    }
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/push-notifications").setAllowedOrigins("*");
+        registry.addEndpoint("/push-notifications").setAllowedOrigins("*").withSockJS();
+    }
+
+}

apps/api/src/main/java/com/fridgetoplate/controller/ExploreController.java

@@ -8,44 +8,27 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fridgetoplate.frontendmodels.RecipeFrontendModel;
 import com.fridgetoplate.interfaces.Explore;
-import com.fridgetoplate.interfaces.Recipe;
-import com.fridgetoplate.model.Ingredient;
-import com.fridgetoplate.model.MealPlanModel;
-import com.fridgetoplate.model.ProfileModel;
-import com.fridgetoplate.repository.ExploreRepository;
-// import com.fridgetoplate.repository.IngredientRepository;
-import com.fridgetoplate.repository.MealPlanRepository;
-
+import com.fridgetoplate.interfaces.RecipeDesc;
+import com.fridgetoplate.service.ExploreService;
 @RestController
 @CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
 @RequestMapping("/explore")
 
 public class ExploreController {
 
     @Autowired
-    private ExploreRepository exploreRepository;
-
-
-    @GetMapping
-    public List<RecipeFrontendModel> findAll() {
-        return exploreRepository.findAll();
-    }
+    private  ExploreService exploreService;
 
     @PostMapping("/search")
-    public List<RecipeFrontendModel> findBySearch(@RequestBody Explore search) {
-        return exploreRepository.findBySearch(search);
+    public List<RecipeDesc> findBySearch(@RequestBody Explore search) {
+        return exploreService.findBySearch(search);
     }
 
 }

apps/api/src/main/java/com/fridgetoplate/controller/MealPlanController.java

@@ -7,15 +7,15 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.fridgetoplate.frontendmodels.MealPlanFrontendModel;
+import com.fridgetoplate.model.Ingredient;
 import com.fridgetoplate.model.MealPlanModel;
-import com.fridgetoplate.repository.MealPlanRepository;
+import com.fridgetoplate.service.MealPlanService;
 
 @RestController
 @CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
@@ -24,54 +24,22 @@
 public class MealPlanController {
 
     @Autowired
-    private MealPlanRepository mealPlanRepository;
+    private MealPlanService mealPlanService;
+
 
     @PostMapping("/save")
     public MealPlanFrontendModel save(@RequestBody MealPlanFrontendModel mealPlan) {
-
-        MealPlanModel plan = new MealPlanModel();
-
-       
-
-        if(mealPlan.getBreakfast() != null) {
-            plan.setBreakfastId(mealPlan.getBreakfast().getRecipeId());
-        }
-        else {
-            plan.setBreakfastId("");
-        }
-        if(mealPlan.getLunch() != null) {
-            plan.setLunchId(mealPlan.getLunch().getRecipeId());
-        }
-        else {
-            plan.setLunchId("");    
-        }
-
-        if(mealPlan.getDinner() != null) {
-            plan.setDinnerId(mealPlan.getDinner().getRecipeId());
-        }
-        else {
-            plan.setDinnerId("");
-        }
-        if(mealPlan.getSnack() != null) {
-            plan.setSnackId(mealPlan.getSnack().getRecipeId());
-        }
-        else {
-            plan.setSnackId("");
-        }
-        
-        plan.setUsername(mealPlan.getUsername());
-        plan.setDate(mealPlan.getDate());
-        return mealPlanRepository.save(plan);
+       return this.mealPlanService.save(mealPlan);
     }
 
-    @GetMapping
-    public List<MealPlanModel> findAll() {
-        return mealPlanRepository.findAll();
+    @GetMapping("/{username}/{date}")
+    public MealPlanFrontendModel findByUsernameAndDate(@PathVariable(value = "username") String username, @PathVariable(value = "date") String date) {
+        return this.mealPlanService.findMealPlan(username, date);
     }
 
-    @GetMapping("/{username}")
-    public MealPlanModel findByUsername(@PathVariable(value = "username") String username) {
-        return mealPlanRepository.findByUsername(username);
+    @PostMapping("/ingredients")
+    public List<Ingredient> getIngredients(@RequestBody MealPlanFrontendModel mealPlan){
+        return this.mealPlanService.findMealPlanIngredients(mealPlan);
     }
 
 }

apps/api/src/main/java/com/fridgetoplate/controller/NotificationController.java

@@ -1,8 +1,8 @@
 package com.fridgetoplate.controller;
 
-import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,36 +12,30 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fridgetoplate.frontendmodels.NotificationsResponseModel;
-import com.fridgetoplate.repository.NotificationsRepository;
+import com.fridgetoplate.service.NotificationService;
 
 @RestController
 @CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.DELETE })
 @RequestMapping("/notifications")
 
 public class NotificationController {
-    
+
     @Autowired
-    private NotificationsRepository notificationsRepository;
+    private NotificationService notificationService;
 
     @GetMapping("/{userId}")
     public NotificationsResponseModel findAll(@PathVariable(value = "userId") String userId){
-        return notificationsRepository.findAll(userId);
-    }
-
-    @DeleteMapping("/{notificationId}")
-    public String delete(@PathVariable(value = "notificationId") String notificationId){
-        return notificationsRepository.delete(notificationId);
+        return notificationService.findAllNotifications(userId);
     }
 
     @DeleteMapping("/clear/{userId}")
     public String clearNotifications(@PathVariable(value = "userId") String userId){
-        return notificationsRepository.clearNotifications(userId);
+        return notificationService.clearNotifications(userId);
     }
 
     @DeleteMapping("/clear/{userId}/{notificationType}")
     public String clearAllNotificationsOfType(@PathVariable(value = "userId") String userId, @PathVariable(value = "notificationType") String type){
-        return notificationsRepository.clearAllNotificationOfType(userId, type);
+        return notificationService.clearAllNotificationOfType(userId, type);
     }
 
-
 }