Release v0.9.0-beta

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,5 +23,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Production URL**
+Can this issue be linked to a relevant production URL? If so, please post the full link here, don't use hyperlinks.
+If you can, post a short description around the url why it's relevant, this is good for SEO reasons.
+
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -13,5 +13,9 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Production URL**
+Can this issue be linked to a relevant production URL? If so, please post the full link here, don't use hyperlinks.
+If you can, post a short description around the url why it's relevant, this is good for SEO reasons.
+
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/workflows/production-deployment.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/run-tests.yml

@@ -6,38 +6,38 @@ on:
 
 jobs:
   unit-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.101
-    
+
     - name: Install dependencies
       run: dotnet restore
-    
+
     - name: Build
       run: dotnet build --configuration Release --no-restore
-    
+
     - name: Test
       run: dotnet test --no-restore --verbosity normal
 
   integration-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Docker Compose
       run: docker-compose up --build -d
 
-    - name: Sleep for 10 seconds
+    - name: Sleep for 30 seconds
       uses: juliangruber/sleep-action@v1
       with:
-        time: 10s
+        time: 30s
 
     - name: Setup node
       uses: actions/setup-node@v1

.github/workflows/staging-deployment.yml

@@ -2,21 +2,21 @@ name: Staging Deployment
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ develop, release/* ]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v2
       - name: Run docker compose build
         run:  docker-compose -f docker-compose.deploy.yml build
-      - name: Docker login 
+      - name: Docker login
         run:  docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Push docker images to dockerhub
         run:  docker-compose -f docker-compose.deploy.yml push
-      - name: Push to server 
+      - name: Push to server
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.STAGING_VPS_IP }}

.gitignore

@@ -336,3 +336,6 @@ IdentityServer/tempkey.rsa
 
 /API/Uploads/Images/*
 !/API/Uploads/Images/.gitkeep
+
+###
+rabbitmq/data/

API/1_API.csproj

@@ -6,6 +6,7 @@
     <DocumentationFile>.\API.xml</DocumentationFile>
     <Company>Digital Excellence Fontys</Company>
     <LangVersion>8</LangVersion>
+    <Version>0.9.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -47,7 +48,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Data\4_Data.csproj" />
+    <ProjectReference Include="..\MessageBrokerPublisher\MessageBrokerPublisher.csproj" />
     <ProjectReference Include="..\Models\5_Models.csproj" />
+    <ProjectReference Include="..\NotificationSystem\NotificationSystem.csproj" />
     <ProjectReference Include="..\Services\2_Services.csproj" />
   </ItemGroup>
 

API/Configuration/MappingProfile.cs

@@ -18,6 +18,7 @@
 using API.Resources;
 using AutoMapper;
 using Models;
+using System.Collections.Generic;
 
 namespace API.Configuration
 {
@@ -31,6 +32,29 @@ public class MappingProfile : Profile
         /// </summary>
         public MappingProfile()
         {
+            CreateMap<ProjectLike, UserProjectLikeResourceResult>()
+                .ForMember(source => source.Id,
+                           option => option
+                               .MapFrom(destination =>
+                                            destination.LikedProject.Id))
+                .ForMember(source => source.Name,
+                           option => option
+                               .MapFrom(destination =>
+                                            destination.LikedProject.Name))
+                .ForMember(source => source.ShortDescription,
+                           option => option
+                               .MapFrom(destination =>
+                                            destination.LikedProject.ShortDescription))
+                .ForMember(source => source.Uri,
+                           option => option
+                               .MapFrom(destination =>
+                                            destination.LikedProject.Uri))
+                .ForMember(source => source.Description,
+                           option => option
+                               .MapFrom(destination =>
+                                            destination.LikedProject.Description))
+                .ForAllOtherMembers(member => member.Ignore());
+
            CreateMap<UserUserResourceResult, UserUser>();
 
            CreateMap<UserUser, UserUserResourceResult>()
@@ -55,6 +79,7 @@ public MappingProfile()
 
             CreateMap<ProjectResource, Project>();
             CreateMap<Project, ProjectResourceResult>();
+            CreateMap<ProjectLike, ProjectLikesResourceResult>();
             CreateMap<Project, ProjectHighlightResourceResult>();
 
             CreateMap<CollaboratorResource, Collaborator>();
@@ -84,6 +109,15 @@ public MappingProfile()
 
             CreateMap<InstitutionResource, Institution>();
             CreateMap<Institution, InstitutionResourceResult>();
+
+            CreateMap<CallToActionResource, CallToAction>()
+                .ForMember(dest => dest.OptionValue, opt => opt.MapFrom(src => src.OptionValue.ToLower()));
+            CreateMap<CallToAction, CallToActionResourceResult>();
+
+            CreateMap<CallToActionOptionResource, CallToActionOption>()
+                .ForMember(dest => dest.Type, opt => opt.MapFrom(src => src.Type.ToLower()))
+                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.Value.ToLower()));
+            CreateMap<CallToActionOption, CallToActionOptionResourceResult>();
         }
     }
 }