Skip to content

Commit

Permalink
Fix(expansion): Expand bug fix (#58)
Browse files Browse the repository at this point in the history
* merge

* removed all local contexts
  • Loading branch information
SwimmingRieux authored Sep 2, 2024
1 parent 2a6b5ca commit 7c7956c
Show file tree
Hide file tree
Showing 121 changed files with 342 additions and 81 deletions.
2 changes: 2 additions & 0 deletions RelationshipAnalysis/Controllers/AttributesController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Services.GraphServices.Abstraction;

namespace RelationshipAnalysis.Controllers;
Expand Down
3 changes: 2 additions & 1 deletion RelationshipAnalysis/Controllers/Auth/AuthController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using RelationshipAnalysis.Dto.Auth;
using RelationshipAnalysis.Services.AuthServices.Abstraction;

Expand Down
4 changes: 3 additions & 1 deletion RelationshipAnalysis/Controllers/Graph/EdgeController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Authorization;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Dto.Graph.Edge;
using RelationshipAnalysis.Services.GraphServices.Abstraction;
using RelationshipAnalysis.Services.GraphServices.Edge.Abstraction;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Controllers/Graph/GraphController.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using RelationshipAnalysis.Dto.Graph;
Expand Down
4 changes: 3 additions & 1 deletion RelationshipAnalysis/Controllers/Graph/NodeController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Authorization;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Dto.Graph.Node;
using RelationshipAnalysis.Services.GraphServices.Abstraction;
using RelationshipAnalysis.Services.GraphServices.Node.Abstraction;
Expand Down
4 changes: 3 additions & 1 deletion RelationshipAnalysis/Controllers/Panel/AdminController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Microsoft.AspNetCore.Authorization;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using RelationshipAnalysis.Dto.Panel.Admin;
using RelationshipAnalysis.Dto.Panel.User;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Controllers/Panel/UserController.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using RelationshipAnalysis.Dto;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http;

namespace RelationshipAnalysis.Dto.Graph.Edge;

Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Dto/Graph/GraphDto.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using RelationshipAnalysis.Dto.Graph.Edge;
using RelationshipAnalysis.Dto.Graph.Node;

Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http;

namespace RelationshipAnalysis.Dto.Graph.Node;

Expand Down
3 changes: 2 additions & 1 deletion RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;

namespace RelationshipAnalysis.Dto.Panel.Admin;

Expand Down
3 changes: 2 additions & 1 deletion RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using RelationshipAnalysis.Dto.Panel.User;
using System.Collections.Generic;
using RelationshipAnalysis.Dto.Panel.User;

namespace RelationshipAnalysis.Dto.Panel.Admin;

Expand Down
2 changes: 2 additions & 0 deletions RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Collections.Generic;

namespace RelationshipAnalysis.Dto.Panel.User;

public class UserOutputInfoDto
Expand Down
6 changes: 6 additions & 0 deletions RelationshipAnalysis/Middlewares/SanitizationMiddleware.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Ganss.Xss;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Controllers;
using Newtonsoft.Json;

Expand Down
3 changes: 2 additions & 1 deletion RelationshipAnalysis/Models/Auth/Role.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

namespace RelationshipAnalysis.Models.Auth;
Expand Down
3 changes: 2 additions & 1 deletion RelationshipAnalysis/Models/Auth/User.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

namespace RelationshipAnalysis.Models.Auth;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Edge/Edge.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Node/Node.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

Expand Down
1 change: 1 addition & 0 deletions RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;

Expand Down
5 changes: 5 additions & 0 deletions RelationshipAnalysis/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Tokens;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Middlewares;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace RelationshipAnalysis.Services.AuthServices.Abstraction;
using Microsoft.AspNetCore.Http;

namespace RelationshipAnalysis.Services.AuthServices.Abstraction;

public interface ICookieSetter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using RelationshipAnalysis.Dto;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using RelationshipAnalysis.Dto;
using RelationshipAnalysis.Dto.Auth;
using LoginDto = RelationshipAnalysis.Dto.Auth.LoginDto;

Expand Down
4 changes: 3 additions & 1 deletion RelationshipAnalysis/Services/AuthServices/CookieSetter.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Microsoft.Extensions.Options;
using System;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
using RelationshipAnalysis.Services.AuthServices.Abstraction;
using RelationshipAnalysis.Settings.JWT;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Security.Cryptography;
using System;
using System.Security.Cryptography;
using System.Text;
using RelationshipAnalysis.Services.AuthServices.Abstraction;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.IdentityModel.Tokens.Jwt;
using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Text;
using Microsoft.Extensions.Options;
Expand Down
4 changes: 3 additions & 1 deletion RelationshipAnalysis/Services/AuthServices/LoginService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Microsoft.EntityFrameworkCore;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Dto;
using RelationshipAnalysis.Dto.Auth;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace RelationshipAnalysis.Services.CRUD.Permissions.Abstraction;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.Permissions.Abstraction;

public interface IPermissionsReceiver
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Newtonsoft.Json;
using RelationshipAnalysis.Models.Auth;
using RelationshipAnalysis.Services.CRUD.Permissions.Abstraction;
using RelationshipAnalysis.Services.CRUD.Role.Abstraction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.Role.Abstraction;

public interface IRoleReceiver
Expand Down
5 changes: 5 additions & 0 deletions RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.Role.Abstraction;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;

public interface IUserAdder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;

public interface IUserDeleter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.User.Abstraction;

public interface IUserUpdater
{
Expand Down
5 changes: 4 additions & 1 deletion RelationshipAnalysis/Services/CRUD/User/UserAdder.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using RelationshipAnalysis.Context;
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.User.Abstraction;

namespace RelationshipAnalysis.Services.CRUD.User;
Expand Down
5 changes: 4 additions & 1 deletion RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using RelationshipAnalysis.Context;
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.User.Abstraction;

namespace RelationshipAnalysis.Services.CRUD.User;
Expand Down
5 changes: 5 additions & 0 deletions RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.User.Abstraction;

Expand Down
5 changes: 4 additions & 1 deletion RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using RelationshipAnalysis.Context;
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.User.Abstraction;

namespace RelationshipAnalysis.Services.CRUD.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;

public interface IUserRolesAdder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;

public interface IUserRolesRemover
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using RelationshipAnalysis.Context;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;

namespace RelationshipAnalysis.Services.CRUD.UserRole;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Services.CRUD.UserRole.Abstraction;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace RelationshipAnalysis.Services.GraphServices.Abstraction;

public interface IAttributesReceiver
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;

namespace RelationshipAnalysis.Services.GraphServices.Abstraction;

public interface ICsvProcessorService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Microsoft.AspNetCore.Http;
using RelationshipAnalysis.Dto;

namespace RelationshipAnalysis.Services.GraphServices.Abstraction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using RelationshipAnalysis.Dto;

namespace RelationshipAnalysis.Services.GraphServices.Abstraction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using System.Collections.Generic;
using System.Dynamic;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using CsvHelper;
using CsvHelper.Configuration;
using Microsoft.AspNetCore.Http;
using RelationshipAnalysis.Services.GraphServices.Abstraction;

namespace RelationshipAnalysis.Services.GraphServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System.Globalization;
using System.IO;
using System.Linq;
using AngleSharp.Text;
using CsvHelper;
using CsvHelper.Configuration;
using Microsoft.AspNetCore.Http;
using Microsoft.IdentityModel.Tokens;
using RelationshipAnalysis.Dto;
using RelationshipAnalysis.Enums;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using RelationshipAnalysis.Context;
using RelationshipAnalysis.Dto;
using RelationshipAnalysis.Dto.Graph.Edge;
Expand Down
Loading

0 comments on commit 7c7956c

Please sign in to comment.