Merge pull request #90 from gdsc-upt/main

Dev Intro Dev
gdsc-upt · Nov 4, 2023 · cf6ece4 · cf6ece4
2 parents 1cb3d7c + a4d4612
commit cf6ece4
Show file tree

Hide file tree

Showing 89 changed files with 2,666 additions and 901 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,4 +6,4 @@
 
 # review when someone opens a pull request.
 
-* @danpercic86
+* @VeniaminBalan
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
           context: .
           secrets: GIT_AUTH_TOKEN=${{ secrets.CR_PAT }}
           push: true
-          tags: ghcr.io/dsc-upt/gdsc-backend-${{ env.BRANCH }}:latest
+          tags: ghcr.io/gdsc-upt/gdsc-backend-${{ env.BRANCH }}:latest
 
   deploy:
     needs: [ build ]

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ COPY --from=build-env /app/out .
 
 COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 RUN chmod +x /usr/bin/docker-entrypoint.sh
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["docker-entrypoint.sh"] 
 
 # Link image with github repo
-LABEL org.opencontainers.image.source=https://github.com/dsc-upt/gdsc-backend
+LABEL org.opencontainers.image.source=https://github.com/gdsc-upt/gdsc-backend
diff --git a/GdscBackend.Tests/AuthTests.cs b/GdscBackend.Tests/AuthTests.cs
diff --git a/GdscBackend.Tests/ContactControllerTests.cs b/GdscBackend.Tests/ContactControllerTests.cs
@@ -3,10 +3,8 @@
 using System.Linq;
 using AutoMapper;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Contacts;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using GdscBackend.Utils.Services;

diff --git a/GdscBackend.Tests/EventsControllerTests.cs b/GdscBackend.Tests/EventsControllerTests.cs
@@ -3,10 +3,9 @@
 using System.Linq;
 using AutoMapper;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Events;
+using GdscBackend.Features.FIles;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.Tests/ExampleTests.cs b/GdscBackend.Tests/ExampleTests.cs
@@ -2,10 +2,8 @@
 using System.Linq;
 using FactoryBot;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.Models.Enums;
+using GdscBackend.Features.Examples;
 using GdscBackend.Tests.Mocks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/GdscBackend.Tests/FilesControllerTests.cs b/GdscBackend.Tests/FilesControllerTests.cs
@@ -2,9 +2,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
+using GdscBackend.Features.FIles;
 using GdscBackend.Tests.Mocks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/GdscBackend.Tests/MembersControllerTests.cs b/GdscBackend.Tests/MembersControllerTests.cs
@@ -3,10 +3,8 @@
 using AutoMapper;
 using FactoryBot;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Members;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.Tests/MenuItemsControllerTests.cs b/GdscBackend.Tests/MenuItemsControllerTests.cs
@@ -3,11 +3,8 @@
 using AutoMapper;
 using FactoryBot;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.Models.Enums;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.MenuItems;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.Tests/Mocks/TestDbContext.cs b/GdscBackend.Tests/Mocks/TestDbContext.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using GdscBackend.Common.Models;
 using GdscBackend.Database;
-using GdscBackend.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace GdscBackend.Tests.Mocks;

diff --git a/GdscBackend.Tests/Mocks/TestWebhookService.cs b/GdscBackend.Tests/Mocks/TestWebhookService.cs
@@ -1,4 +1,4 @@
-using GdscBackend.Models;
+using GdscBackend.Features.Contacts;
 using GdscBackend.Utils.Services;
 using Xunit.Abstractions;
 

diff --git a/GdscBackend.Tests/SettingsControllerTests.cs b/GdscBackend.Tests/SettingsControllerTests.cs
@@ -3,11 +3,8 @@
 using AutoMapper;
 using FactoryBot;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.Models.Enums;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Settings;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.Tests/TeamsControllerTests.cs b/GdscBackend.Tests/TeamsControllerTests.cs
@@ -4,10 +4,9 @@
 using AutoMapper;
 using FactoryBot;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Members;
+using GdscBackend.Features.Teams;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.Tests/TechnologiesControllerTests.cs b/GdscBackend.Tests/TechnologiesControllerTests.cs
@@ -3,10 +3,8 @@
 using System.Linq;
 using AutoMapper;
 using Faker;
-using GdscBackend.Controllers.v1;
 using GdscBackend.Database;
-using GdscBackend.Models;
-using GdscBackend.RequestModels;
+using GdscBackend.Features.Technologies;
 using GdscBackend.Tests.Mocks;
 using GdscBackend.Utils.Mappers;
 using Microsoft.AspNetCore.Http;

diff --git a/GdscBackend.sln.DotSettings b/GdscBackend.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gdsc/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/GdscBackend/Auth/LoginResponse.cs b/GdscBackend/Auth/LoginResponse.cs
diff --git a/GdscBackend/Auth/LoginViewModel.cs b/GdscBackend/Auth/LoginViewModel.cs
diff --git a/GdscBackend/Auth/RegisterViewModel.cs b/GdscBackend/Auth/RegisterViewModel.cs
diff --git a/GdscBackend/Auth/Role.cs b/GdscBackend/Auth/Role.cs
diff --git a/GdscBackend/Auth/User.cs b/GdscBackend/Auth/User.cs
diff --git a/GdscBackend/Auth/UserViewModel.cs b/GdscBackend/Auth/UserViewModel.cs
diff --git a/GdscBackend/Models/IModel.cs → GdscBackend/Common/Models/IModel.cs b/GdscBackend/Models/IModel.cs → GdscBackend/Common/Models/IModel.cs
@@ -1,4 +1,4 @@
-namespace GdscBackend.Models;
+namespace GdscBackend.Common.Models;
 
 public interface IModel
 {

diff --git a/GdscBackend/Models/Model.cs → GdscBackend/Common/Models/Model.cs b/GdscBackend/Models/Model.cs → GdscBackend/Common/Models/Model.cs
@@ -1,4 +1,4 @@
-namespace GdscBackend.Models;
+namespace GdscBackend.Common.Models;
 
 public abstract class Model : IModel
 {

diff --git a/GdscBackend/Common/RequestModels/Request.cs b/GdscBackend/Common/RequestModels/Request.cs
@@ -0,0 +1,5 @@
+namespace GdscBackend.Common.RequestModels;
+
+public class Request
+{
+}