Changing project Name Also the refactoring started

Edrisym · Sep 3, 2024 · 4ee352f · 4ee352f
1 parent b7904a6
commit 4ee352f
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -409,14 +409,14 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-obj/Debug/net6.0/refint/Sample.GoogleCalendarApi.dll
-bin/Debug/net6.0/Sample.GoogleCalendarApi.dll
-bin/Debug/net6.0/Sample.GoogleCalendarApi.dll
-bin/Debug/net6.0/Sample.GoogleCalendarApi.pdb
-obj/Debug/net6.0/Sample.GoogleCalendarApi.AssemblyInfo.cs
-obj/Debug/net6.0/Sample.GoogleCalendarApi.AssemblyInfoInputs.cache
-obj/Debug/net6.0/Sample.GoogleCalendarApi.dll
-obj/Debug/net6.0/Sample.GoogleCalendarApi.pdb
-obj/Debug/net6.0/Sample.GoogleCalendarApi.sourcelink.json
+obj/Debug/net6.0/refint/GoogleCalendarApi.dll
+bin/Debug/net6.0/GoogleCalendarApi.dll
+bin/Debug/net6.0/GoogleCalendarApi.pdb
+obj/Debug/net6.0/GoogleCalendarApi.AssemblyInfo.cs
+obj/Debug/net6.0/GoogleCalendarApi.AssemblyInfoInputs.cache
+obj/Debug/net6.0/GoogleCalendarApi.dll
+obj/Debug/net6.0/GoogleCalendarApi.pdb
+obj/Debug/net6.0/GoogleCalendarApi.sourcelink.json
 obj/Debug/net6.0/ref/Sample.GoogleCalendarApi.dll
 obj/Debug/net6.0/refint/Sample.GoogleCalendarApi.dll
+/appsettings.Development.json
diff --git a/Common/Method.cs b/Common/Method.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using NodaTime.TimeZones;
 
-namespace CalendarApi.Common;
+namespace GoogleCalendarApi.Common;
 
 public class Method
 {

diff --git a/Common/Model/Credentials.cs b/Common/Model/Credentials.cs
@@ -1,4 +1,4 @@
-namespace Sample.GoogleCalendarApi.Common.Model;
+namespace GoogleCalendarApi.Common.Model;
 
 public class Credentials
 {

diff --git a/Common/Model/EventModel.cs b/Common/Model/EventModel.cs
@@ -1,6 +1,4 @@
-using Google.Apis.Calendar.v3.Data;
-
-namespace Sample.GoogleCalendarApi.Common.Model;
+namespace GoogleCalendarApi.Common.Model;
 
 public class EventModel
 {

diff --git a/Controllers/GoogleCalendarController.cs b/Controllers/GoogleCalendarController.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-using Sample.GoogleCalendarApi.Common.Model;
-using Sample.GoogleCalendarApi.Services;
+using GoogleCalendarApi.Common.Model;
+using GoogleCalendarApi.Services;
+using Microsoft.AspNetCore.Mvc;
 
-namespace Sample.GoogleCalendarApi.Controllers
+namespace GoogleCalendarApi.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]

diff --git a/Controllers/OAuthController.cs b/Controllers/OAuthController.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
+using GoogleCalendarApi.Services;
+using GoogleCalendarApi.Settings;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Sample.GoogleCalendarApi.Services;
-using Sample.GoogleCalendarApi.Settings;
 
-namespace Sample.GoogleCalendarApi.Controllers
+namespace GoogleCalendarApi.Controllers
 {
     [ApiController]
     public class OAuthController : ControllerBase

diff --git a/Sample.GoogleCalendarApi.csproj → GoogleCalendarApi.csproj b/Sample.GoogleCalendarApi.csproj → GoogleCalendarApi.csproj
diff --git a/Sample.GoogleCalendarApi.sln → GoogleCalendarApi.sln b/Sample.GoogleCalendarApi.sln → GoogleCalendarApi.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.002.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.GoogleCalendarApi", "Sample.GoogleCalendarApi.csproj", "{2C65D9B1-B439-41B1-9239-2CF22155F4AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoogleCalendarApi", "GoogleCalendarApi.csproj", "{2C65D9B1-B439-41B1-9239-2CF22155F4AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Program.cs b/Program.cs
@@ -1,6 +1,6 @@
-using Sample.GoogleCalendarApi.Common.Model;
-using Sample.GoogleCalendarApi.Services;
-using Sample.GoogleCalendarApi.Settings;
+using GoogleCalendarApi.Common.Model;
+using GoogleCalendarApi.Services;
+using GoogleCalendarApi.Settings;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/Services/GoogleCalendarService.cs b/Services/GoogleCalendarService.cs
@@ -1,13 +1,14 @@
 using Google.Apis.Calendar.v3;
 using Google.Apis.Calendar.v3.Data;
+using GoogleCalendarApi.Common.Model;
+using GoogleCalendarApi.Settings;
 using Newtonsoft.Json.Linq;
-using Sample.GoogleCalendarApi.Settings;
 using RestSharp;
 using Newtonsoft.Json;
-using Sample.GoogleCalendarApi.Common.Model;
 using Microsoft.Extensions.Options;
+using Method = GoogleCalendarApi.Common.Method;
 
-namespace Sample.GoogleCalendarApi.Services
+namespace GoogleCalendarApi.Services
 {
     public class GoogleCalendarService : IGoogleCalendarService
     {
@@ -192,7 +193,7 @@ public string GetAuthCode()
                 var include_granted_scopes = "true";
                 // var prompt = "select_account";
                 var login_hint = _settings.Value.LoginHint;
-                string redirect_uri_encode = CalendarApi.Common.Method.UrlEncodeForGoogle(redirectURL);
+                string redirect_uri_encode = Method.UrlEncodeForGoogle(redirectURL);
                 var mainURL = string.Format(scopeURL1, redirect_uri_encode, state, response_type, client_id, scope,
                     access_type, include_granted_scopes, login_hint);
 

diff --git a/Services/IGoogleCalendarService.cs b/Services/IGoogleCalendarService.cs
@@ -1,8 +1,8 @@
 
 using Google.Apis.Calendar.v3.Data;
-using Sample.GoogleCalendarApi.Common.Model;
+using GoogleCalendarApi.Common.Model;
 
-namespace Sample.GoogleCalendarApi.Services
+namespace GoogleCalendarApi.Services
 {
     public interface IGoogleCalendarService
     {

diff --git a/Services/IOAuthService.cs b/Services/IOAuthService.cs
@@ -1,10 +1,10 @@
 using Google.Apis.Auth.OAuth2;
 using Google.Apis.Calendar.v3;
+using GoogleCalendarApi.Settings;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
-using Sample.GoogleCalendarApi.Settings;
 
-namespace Sample.GoogleCalendarApi.Services;
+namespace GoogleCalendarApi.Services;
 
 public interface IOAuthService
 {

diff --git a/Services/OAuthService.cs b/Services/OAuthService.cs
@@ -4,11 +4,11 @@
 using Newtonsoft.Json.Linq;
 using Google.Apis.Auth.OAuth2.Flows;
 using Google.Apis.Auth.OAuth2.Responses;
-using Sample.GoogleCalendarApi.Settings;
 using Google.Apis.Services;
+using GoogleCalendarApi.Settings;
 
 
-namespace Sample.GoogleCalendarApi.Services;
+namespace GoogleCalendarApi.Services;
 
 public class OAuthService : IOAuthService
 {

diff --git a/Settings/GoogleCalendarSettings.cs b/Settings/GoogleCalendarSettings.cs
@@ -1,4 +1,4 @@
-namespace Sample.GoogleCalendarApi.Settings
+namespace GoogleCalendarApi.Settings
 {
     public class GoogleCalendarSettings : IGoogleCalendarSettings
     {

diff --git a/Settings/IGoogleCalendarSettings.cs b/Settings/IGoogleCalendarSettings.cs
@@ -1,4 +1,4 @@
-namespace Sample.GoogleCalendarApi.Settings
+namespace GoogleCalendarApi.Settings
 {
     public interface IGoogleCalendarSettings
     {