AgileWebs/Core.Thalos.DAL.API
6
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: AgileWebs:feature/add-tenant-services
Branches Tags
AgileWebs:main AgileWebs:development AgileWebs:feature/add-tenantproperty-touser AgileWebs:bugfix/adjust-services AgileWebs:feature/add-tenant-services AgileWebs:feature/pipeline-setup AgileWebs:feature/configure-authentication AgileWebs:feature/adapt-packages AgileWebs:bugfix/fix-endpoints AgileWebs:feature/use-blueprint-mongo-rest-of-services AgileWebs:feature/blueprint-mongo-in-module-service AgileWebs:feature/use-blueprint-mongo AgileWebs:feature/reeplacecerberosbythalos AgileWebs:feature/improvements-removeoldcode
...
pull from: AgileWebs:feature/add-tenantproperty-touser
Branches Tags
AgileWebs:development AgileWebs:feature/add-tenantproperty-touser AgileWebs:bugfix/adjust-services AgileWebs:feature/add-tenant-services AgileWebs:feature/pipeline-setup AgileWebs:feature/configure-authentication AgileWebs:feature/adapt-packages AgileWebs:bugfix/fix-endpoints AgileWebs:feature/use-blueprint-mongo-rest-of-services AgileWebs:feature/blueprint-mongo-in-module-service AgileWebs:feature/use-blueprint-mongo AgileWebs:feature/reeplacecerberosbythalos AgileWebs:feature/improvements-removeoldcode AgileWebs:main

3 Commits
feature/ad ... feature/ad

Author SHA1 Message Date
Sergio Matias
a2a2b6ef8d Remove GUID property and add modules in get token adapter service 2025-08-08 23:58:42 -06:00
Sergio Matias
24a5fd28fb Merge branch 'feature/add-tenant-services' into development 2025-08-05 12:54:31 -06:00
Sergio Matías
827e5ec270 Merge pull request 'Add tenant services' (#9) from feature/add-tenant-services into development 
Reviewed-on: #9
Reviewed-by: efrain_marin <efrain.marin@agilewebs.com>
Reviewed-by: OscarMmtz <oscar.morales@agilewebs.com>
 2025-08-05 18:53:57 +00:00
3 changed files with 102 additions and 5 deletions
Expand all files Collapse all files

2
Core.Thalos.Domain/Core.Thalos.Domain.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" />
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.1" />
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.4" />
</ItemGroup>
</Project>

2
Core.Thalos.Provider/Core.Thalos.Provider.csproj
View File

@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.1" />
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" />
<PackageReference Include="Mapster" Version="7.4.2-pre02" />
</ItemGroup>

103
Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs
View File

@@ -241,6 +241,16 @@ namespace Core.Thalos.Provider.Providers.Onboarding
new BsonDocument("$unwind", "$role"),
new BsonDocument("$match", new BsonDocument("role.status", Core.Blueprint.Mongo.StatusEnum.Active.ToString())),
// Tenant lookup
new BsonDocument("$lookup", new BsonDocument
{
{ "from", "Tenants" },
{ "localField", "tenantId" },
{ "foreignField", "_id" },
{ "as", "tenant" }
}),
new BsonDocument("$unwind", "$tenant"),
new BsonDocument("$addFields", new BsonDocument
{
{ "role.permissions", new BsonDocument("$map", new BsonDocument
@@ -303,6 +313,25 @@ namespace Core.Thalos.Provider.Providers.Onboarding
{ "role.updatedAt", 1 },
{ "role.createdBy", 1 },
{ "role.updatedBy", 1 },
{ "tenant._id", 1 },
{ "tenant.name", 1 },
{ "tenant.taxIdentifier", 1 },
{ "tenant.addressLine1", 1 },
{ "tenant.addressLine2", 1 },
{ "tenant.city", 1 },
{ "tenant.state", 1 },
{ "tenant.country", 1 },
{ "tenant.postalCode", 1 },
{ "tenant.contactEmail", 1 },
{ "tenant.contactPhone", 1 },
{ "tenant.website", 1 },
{ "tenant.connectionString", 1 },
{ "tenant.isolated", 1 },
{ "tenant.status", 1 },
{ "tenant.createdAt", 1 },
{ "tenant.updatedAt", 1 },
{ "tenant.createdBy", 1 },
{ "tenant.updatedBy", 1 },
{ "permissions", 1 },
{ "modules", 1 }
})
@@ -316,8 +345,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding
{
User = new UserAdapter
{
Id = result["_id"]?.ToString() ?? "",
Guid = result.Contains("guid") && !result["guid"].IsBsonNull ? result["guid"].AsString : string.Empty,
_Id = result["_id"]?.ToString() ?? "",
Email = result.Contains("email") && !result["email"].IsBsonNull ? result["email"].AsString : string.Empty,
Name = result.Contains("name") && !result["name"].IsBsonNull ? result["name"].AsString : string.Empty,
MiddleName = result.Contains("middleName") && !result["middleName"].IsBsonNull ? result["middleName"].AsString : string.Empty,
@@ -395,13 +423,82 @@ namespace Core.Thalos.Provider.Providers.Onboarding
? result["role"]["updatedBy"].AsString
: string.Empty
},
Tenant = result.Contains("tenant") && result["tenant"].IsBsonDocument
? new TenantAdapter
{
Id = result.Contains("tenant") && result["tenant"].IsBsonDocument && result["tenant"].AsBsonDocument.Contains("_id")
? result["tenant"]["_id"]?.ToString() ?? ""
: string.Empty,
Name = result["tenant"].AsBsonDocument.Contains("name") && !result["tenant"]["name"].IsBsonNull
? result["tenant"]["name"].AsString
: string.Empty,
TaxIdentifier = result["tenant"].AsBsonDocument.Contains("taxIdentifier") && !result["tenant"]["taxIdentifier"].IsBsonNull
? result["tenant"]["taxIdentifier"].AsString
: string.Empty,
AddressLine1 = result["tenant"].AsBsonDocument.Contains("addressLine1") && !result["tenant"]["addressLine1"].IsBsonNull
? result["tenant"]["addressLine1"].AsString
: string.Empty,
AddressLine2 = result["tenant"].AsBsonDocument.Contains("addressLine2") && !result["tenant"]["addressLine2"].IsBsonNull
? result["tenant"]["addressLine2"].AsString
: null,
City = result["tenant"].AsBsonDocument.Contains("city") && !result["tenant"]["city"].IsBsonNull
? result["tenant"]["city"].AsString
: string.Empty,
State = result["tenant"].AsBsonDocument.Contains("state") && !result["tenant"]["state"].IsBsonNull
? result["tenant"]["state"].AsString
: string.Empty,
Country = result["tenant"].AsBsonDocument.Contains("country") && !result["tenant"]["country"].IsBsonNull
? result["tenant"]["country"].AsString
: string.Empty,
PostalCode = result["tenant"].AsBsonDocument.Contains("postalCode") && !result["tenant"]["postalCode"].IsBsonNull
? result["tenant"]["postalCode"].AsString
: string.Empty,
ContactEmail = result["tenant"].AsBsonDocument.Contains("contactEmail") && !result["tenant"]["contactEmail"].IsBsonNull
? result["tenant"]["contactEmail"].AsString
: string.Empty,
ContactPhone = result["tenant"].AsBsonDocument.Contains("contactPhone") && !result["tenant"]["contactPhone"].IsBsonNull
? result["tenant"]["contactPhone"].AsString
: string.Empty,
Website = result["tenant"].AsBsonDocument.Contains("website") && !result["tenant"]["website"].IsBsonNull
? result["tenant"]["website"].AsString
: null,
ConnectionString = result["tenant"].AsBsonDocument.Contains("connectionString") && !result["tenant"]["connectionString"].IsBsonNull
? result["tenant"]["connectionString"].AsString
: null,
Isolated = result["tenant"].AsBsonDocument.Contains("isolated") && !result["tenant"]["isolated"].IsBsonNull
? result["tenant"]["isolated"].ToBoolean()
: false,
CreatedAt = result["tenant"].AsBsonDocument.Contains("createdAt") && !result["tenant"]["createdAt"].IsBsonNull
? result["tenant"]["createdAt"].ToUniversalTime()
: DateTime.MinValue,
UpdatedAt = result["tenant"].AsBsonDocument.Contains("updatedAt") && !result["tenant"]["updatedAt"].IsBsonNull
? result["tenant"]["updatedAt"].ToUniversalTime()
: DateTime.MinValue,
CreatedBy = result["tenant"].AsBsonDocument.Contains("createdBy") && !result["tenant"]["createdBy"].IsBsonNull
? result["tenant"]["createdBy"].AsString
: string.Empty,
UpdatedBy = result["tenant"].AsBsonDocument.Contains("updatedBy") && !result["tenant"]["updatedBy"].IsBsonNull
? result["tenant"]["updatedBy"].AsString
: string.Empty,
Status = result["tenant"].AsBsonDocument.Contains("status") && !result["tenant"]["status"].IsBsonNull
? (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["tenant"]["status"].AsString)
: Core.Blueprint.Mongo.StatusEnum.Active
}
: null,
Permissions = result.Contains("permissions") && result["permissions"].IsBsonArray
? result["permissions"].AsBsonArray
.Where(p => p != null && p.IsBsonDocument)
.Select(p => BsonSerializer.Deserialize<PermissionAdapter>(p.AsBsonDocument))
.Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active)
.ToList()
: new List<PermissionAdapter>()
: new List<PermissionAdapter>(),
Modules = result.Contains("modules") && result["modules"].IsBsonArray
? result["modules"].AsBsonArray
.Where(p => p != null && p.IsBsonDocument)
.Select(p => BsonSerializer.Deserialize<ModuleAdapter>(p.AsBsonDocument))
.Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active)
.ToList()
: new List<ModuleAdapter>()
};