Abdulbari/sgeUpdated
1
0
Fork 1
forked from BLC/sgeUpdated
Code Pull Requests Actions Activity

Compare commits

base: Abdulbari:backbr
Branches Tags
Abdulbari:main Abdulbari:fix/harbor-connection-port Abdulbari:testv Abdulbari:test Abdulbari:multi-emission-feature Abdulbari:backbr Abdulbari:not-main omar:main omar:multi-emission-feature omar:backbr omar:not-main
..
compare: omar:not-main
Branches Tags
omar:main omar:multi-emission-feature omar:backbr omar:not-main Abdulbari:main Abdulbari:fix/harbor-connection-port Abdulbari:testv Abdulbari:test Abdulbari:multi-emission-feature Abdulbari:backbr Abdulbari:not-main

2 Commits
backbr ... not-main

Author SHA1 Message Date
k3n9achi
89b4644983 few translation edits and changing it to use vmEmission query 2025-08-09 20:08:56 +03:00
k3n9achi
39fffadbd2 fixed issue GUI and Datacenter tab related 2025-08-07 19:28:56 +03:00
47 changed files with 2174 additions and 2021 deletions
Expand all files Collapse all files

791
sge-backend/message.json
View File

@@ -1,173 +1,33 @@
{
"id":111,
"data_center":"new lab blc",
"physical_machines":{
"10.150.1.33":{
"tag":"main_optimization_space",
"name":"compute2",
"power":158.23672131147552,
"cloud_system":"open-stack",
"confg":[
"compute2",
11,
101,
91,
114
],
"projects":{
"48966d34ff274def88db7f7b6d9f5cdc":{
"main_optimization_space":{
"vms":{
"10.150.1.112":{
"vm_name":"nginx-proxyV2",
"10.150.1.101":{
"vm_name":"Bgreen",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"m1.small",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.medium",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"nginx-proxyV2",
1,
2,
20,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.114":{
"vm_name":"BLC-AYPOS-Development-5",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.19",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-5",
2,
3,
8,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.145":{
"vm_name":"BLC-AYPOS-Development-9",
"power":8.857817947598239,
"state":"active",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.0",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-9",
2,
1,
8,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.167":{
"vm_name":"prometheus_serverV3",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"ayposYedek",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"prometheus_serverV3",
2,
6,
60,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.190":{
"vm_name":"BLC-AYPOS-Development-6",
"power":7.483440624373921,
"state":"active",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.16",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-6",
"Bgreen",
2,
4,
8,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
40,
"compute4"
]
},
"10.150.1.199":{
"vm_name":"gitea-server",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"m1.large",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"gitea-server",
4,
8,
80,
"compute2"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
}
}
},
"10.150.1.34":{
"tag":"main_optimization_space",
"name":"compute3",
"power":22.16875409836066,
"cloud_system":"open-stack",
"confg":[
"compute3",
24,
115,
151,
114
],
"vms":{
"10.150.1.107":{
"vm_name":"BLC-AYPOS-Development-1",
"power":0,
@@ -176,9 +36,10 @@
"host":"compute3",
"flavor_name":"aypos.test.flavour.8",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -188,92 +49,53 @@
3,
8,
"compute3"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.133":{
"vm_name":"BLC-AYPOS-Development-2",
"10.150.1.112":{
"vm_name":"nginx-proxyV2",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.34",
"host":"compute3",
"flavor_name":"aypos.test.flavour.15",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"m1.small",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-2",
2,
4,
8,
"compute3"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.193":{
"vm_name":"BLC-AYPOS-Development-4",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.34",
"host":"compute3",
"flavor_name":"aypos.test.flavour.4",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-4",
2,
"nginx-proxyV2",
1,
8,
"compute3"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
}
}
2,
20,
"compute2"
]
},
"10.150.1.35":{
"tag":"main_optimization_space",
"name":"compute4",
"power":161.65611475409833,
"cloud_system":"open-stack",
"confg":[
"compute4",
-19,
19,
87,
114
],
"vms":{
"10.150.1.101":{
"vm_name":"Bgreen",
"10.150.1.114":{
"vm_name":"BLC-AYPOS-Development-5",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.large",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.19",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"Bgreen",
4,
"BLC-AYPOS-Development-5",
2,
3,
8,
80,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
"compute2"
]
},
"10.150.1.123":{
"vm_name":"SGE",
@@ -283,9 +105,10 @@
"host":"compute4",
"flavor_name":"ForJAVA",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -295,8 +118,7 @@
32,
150,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.130":{
"vm_name":"aybuke",
@@ -306,9 +128,10 @@
"host":"compute4",
"flavor_name":"m1.public",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -318,20 +141,43 @@
8,
50,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.133":{
"vm_name":"BLC-AYPOS-Development-2",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.34",
"host":"compute3",
"flavor_name":"aypos.test.flavour.15",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-2",
2,
4,
8,
"compute3"
]
},
"10.150.1.141":{
"vm_name":"BLC-AYPOS-Development-0",
"power":1.1574191009150598,
"power":12.178434411667777,
"state":"active",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"aypos.test.flavour.11",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -341,162 +187,31 @@
3,
8,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.155":{
"vm_name":"Aypos-Ulak",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.vrealize",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"Aypos-Ulak",
8,
16,
50,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.171":{
"vm_name":"blc-meet",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.devstack",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"blc-meet",
4,
7,
60,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.174":{
"vm_name":"mail-server",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"mail-server",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"mail-server",
4,
8,
100,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.175":{
"vm_name":"BLC-AYPOS-Development-7",
"power":0.765597705736144,
"10.150.1.145":{
"vm_name":"BLC-AYPOS-Development-9",
"power":14.950904196341009,
"state":"active",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"aypos.test.flavour.19",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.0",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-7",
"BLC-AYPOS-Development-9",
2,
3,
8,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
},
"10.150.1.180":{
"vm_name":"BLC-AYPOS-Development-8",
"power":0.3963838074873964,
"state":"active",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"aypos.test.flavour.6",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-8",
1,
2,
8,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
"compute2"
]
},
"10.150.1.200":{
"vm_name":"ollama",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.vrealize",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"ollama",
8,
16,
50,
"compute4"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
}
}
},
"10.150.1.32":{
"tag":"main_optimization_space",
"name":"compute1",
"power":36.502836065573774,
"cloud_system":"open-stack",
"confg":[
"compute1",
10,
97,
211,
114
],
"vms":{
"10.150.1.150":{
"vm_name":"blc-cloud",
"power":0,
@@ -505,9 +220,10 @@
"host":"compute1",
"flavor_name":"m1.xlarge",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -517,8 +233,76 @@
16,
160,
"compute1"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.155":{
"vm_name":"Aypos-Ulak",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.vrealize",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"Aypos-Ulak",
8,
16,
50,
"compute4"
]
},
"10.150.1.167":{
"vm_name":"prometheus_serverV3",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"ayposYedek",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"prometheus_serverV3",
2,
6,
60,
"compute2"
]
},
"10.150.1.171":{
"vm_name":"blc-meet",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.devstack",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"blc-meet",
4,
7,
60,
"compute4"
]
},
"10.150.1.172":{
"vm_name":"blc-office",
@@ -528,9 +312,10 @@
"host":"compute1",
"flavor_name":"m1.large",
"emissionsource":{
"Dizel":15,
"Ham petrol":10,
"Motor benzini":35,
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
@@ -540,9 +325,223 @@
8,
80,
"compute1"
],
"project":"48966d34ff274def88db7f7b6d9f5cdc"
]
},
"10.150.1.174":{
"vm_name":"mail-server",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"mail-server",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"mail-server",
4,
8,
100,
"compute4"
]
},
"10.150.1.175":{
"vm_name":"BLC-AYPOS-Development-7",
"power":19.256314103409117,
"state":"active",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"aypos.test.flavour.19",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-7",
2,
3,
8,
"compute4"
]
},
"10.150.1.180":{
"vm_name":"BLC-AYPOS-Development-8",
"power":26.738567147437937,
"state":"active",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"aypos.test.flavour.6",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-8",
1,
2,
8,
"compute4"
]
},
"10.150.1.190":{
"vm_name":"BLC-AYPOS-Development-6",
"power":42.36942549990342,
"state":"active",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"aypos.test.flavour.16",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-6",
2,
4,
8,
"compute2"
]
},
"10.150.1.193":{
"vm_name":"BLC-AYPOS-Development-4",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.34",
"host":"compute3",
"flavor_name":"aypos.test.flavour.4",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"BLC-AYPOS-Development-4",
2,
1,
8,
"compute3"
]
},
"10.150.1.199":{
"vm_name":"gitea-server",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.33",
"host":"compute2",
"flavor_name":"m1.large",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"gitea-server",
4,
8,
80,
"compute2"
]
},
"10.150.1.200":{
"vm_name":"ollama",
"power":0,
"state":"inactive",
"hosting_pm":"10.150.1.35",
"host":"compute4",
"flavor_name":"m1.vrealize",
"emissionsource":{
"Dizel":10,
"Ham petrol":5,
"Orimulsion":15,
"Motor benzini":30,
"Jet benzini":40
},
"tag":"main_optimization_space",
"confg":[
"ollama",
8,
16,
50,
"compute4"
]
}
},
"pms":{
"10.150.1.33":{
"tag":"main_optimization_space",
"name":"compute2",
"power":159.86075409836062,
"confg":[
"compute2",
11,
101,
91,
114
]
},
"10.150.1.34":{
"tag":"main_optimization_space",
"name":"compute3",
"power":21.31772131147542,
"confg":[
"compute3",
24,
115,
151,
114
]
},
"10.150.1.35":{
"tag":"main_optimization_space",
"name":"compute4",
"power":189.92359016393448,
"confg":[
"compute4",
-17,
23,
87,
114
]
},
"10.150.1.32":{
"tag":"main_optimization_space",
"name":"compute1",
"power":36.45219672131149,
"confg":[
"compute1",
10,
97,
211,
114
]
}
}
},
"sub_optimization_space":{
}
}
}

75
sge-backend/src/main/java/com/sgs/SgsApplication.java
View File

@@ -2,8 +2,6 @@ package com.sgs;
import com.sgs.graphql.activitySubUnit.domain.ActivitySubUnit;
import com.sgs.graphql.activitySubUnit.service.ActivitySubUnitService;
import com.sgs.graphql.area.domain.Area;
import com.sgs.graphql.area.service.AreaService;
import com.sgs.graphql.city.domain.City;
import com.sgs.graphql.city.repo.CityRepo;
import com.sgs.graphql.city.service.CityService;
@@ -75,7 +73,6 @@ public class SgsApplication implements CommandLineRunner {
private final PermissionService permissionService;
private final RoleService roleService;
private final RoleRepo roleRepo;
private final AreaService areaService;
private final NeighborhoodRepo neighborhoodRepo;
private final NeighborhoodService neighborhoodService;
private final CityService cityService;
@@ -121,7 +118,7 @@ public class SgsApplication implements CommandLineRunner {
@Autowired
public SgsApplication(RoleService roleService, PermissionService permissionService, RoleRepo roleRepo,
AreaService areaService, NeighborhoodRepo neighborhoodRepo, NeighborhoodService neighborhoodService, CityService cityService,
NeighborhoodRepo neighborhoodRepo, NeighborhoodService neighborhoodService, CityService cityService,
CityRepo cityRepo, DistrictRepo districtRepo, DistrictService districtService, CountryRepo countryRepo,
CountryService countryService, OrganizationService organizationService, UserService userService,
PasswordEncoder passwordEncoder, SectorService sectorService, SubSectorService subSectorService,
@@ -136,7 +133,6 @@ public class SgsApplication implements CommandLineRunner {
this.roleService = roleService;
this.permissionService = permissionService;
this.roleRepo = roleRepo;
this.areaService = areaService;
this.neighborhoodRepo = neighborhoodRepo;
this.neighborhoodService = neighborhoodService;
this.cityService = cityService;
@@ -430,10 +426,6 @@ public class SgsApplication implements CommandLineRunner {
data_center_read.setTag(PermissionName.DATA_CENTER_READ);
data_center_read.setDescription(PermissionDescription.DATA_CENTER_READ);
Permission paginate_datacenters_get = new Permission();
paginate_datacenters_get.setTag(PermissionName.PAGINATE_DATACENTERS_GET);
paginate_datacenters_get.setDescription(PermissionDescription.PAGINATE_DATACENTERS_GET);
permissionService.saveAll(List.of(
show_graphics, activities_get, paginate_user_histories, activity_sub_units_get, sub_sectors_get,
sectors_get, deleted_items, undelete_items, user_create, user_update, user_delete, paginate_users_get,
@@ -450,7 +442,7 @@ public class SgsApplication implements CommandLineRunner {
question_create, question_delete, question_update, paginate_questions_get,
published_survey_create, surveys_get, paginate_surveys_get,
survey_add, survey_delete, survey_update, settings_access, data_center_create, data_center_delete,
data_center_update, data_center_read, paginate_datacenters_get));
data_center_update, data_center_read));
}
public void createDefaultRole() {
@@ -779,27 +771,6 @@ public class SgsApplication implements CommandLineRunner {
mailInfoService.save(mailInfo);
}
public void ensureMissingPermissions() {
// Check if paginate_datacenters_get permission exists
Optional<Permission> datacenterPermission = permissionService.findByTag("paginate_datacenters_get");
if (!datacenterPermission.isPresent()) {
// Create the missing permission
Permission paginate_datacenters_get = new Permission();
paginate_datacenters_get.setTag(PermissionName.PAGINATE_DATACENTERS_GET);
paginate_datacenters_get.setDescription(PermissionDescription.PAGINATE_DATACENTERS_GET);
permissionService.save(paginate_datacenters_get);
}
// Ensure SUPER_ADMIN has all permissions
Optional<Role> superAdminRole = roleRepo.findByTag("SUPER_ADMIN");
if (superAdminRole.isPresent()) {
Role role = superAdminRole.get();
List<Permission> allPermissions = permissionService.findAll();
role.setPermissions(allPermissions);
roleService.save(role);
}
}
@Override
public void run(String... args) throws Exception {
if (mailInfoService.findAll().isEmpty()) {
@@ -845,8 +816,6 @@ public class SgsApplication implements CommandLineRunner {
if (roleService.findAll().isEmpty()) {
createDefaultRole();
}
// Ensure all permissions are created and assigned to SUPER_ADMIN
ensureMissingPermissions();
if (organizationService.findAll().isEmpty()) {
createDefaultOrganization();
}
@@ -865,34 +834,18 @@ public class SgsApplication implements CommandLineRunner {
if (neighborhoodService.findAll().isEmpty()) {
createNeighborhoodsFromJson();
}
if (!cityService.findAll().isEmpty()) {
createDefaultArea();
}
}
void createDefaultArea() {
// Check if default area already exists
List<Area> existingAreas = areaService.findAll();
boolean defaultAreaExists = existingAreas.stream()
.anyMatch(area -> "Turkiye".equals(area.getTag()) && area.isDefaultArea());
if (!defaultAreaExists) {
Area defaultArea = new Area();
defaultArea.setTag("Turkiye");
defaultArea.setDefaultArea(true);
defaultArea.setDeleted(false);
// Get all cities to add to the default area
List<City> allCities = cityService.findAll();
defaultArea.setCities(allCities);
// Get the Turkey country to add to the default area
List<Country> countries = countryService.findAll();
if (!countries.isEmpty()) {
defaultArea.setCountries(countries);
}
areaService.save(defaultArea);
// Add new permission if it doesn't exist
// [Remove Later]
if (permissionService.findAll().stream().noneMatch(p -> PermissionName.SETTINGS_ACCESS.equals(p.getTag()))) {
Permission settingsAccess = new Permission();
settingsAccess.setTag(PermissionName.SETTINGS_ACCESS);
settingsAccess.setDescription(PermissionDescription.SETTINGS_ACCESS);
settingsAccess.setDefault_permission(false);
settingsAccess.setDeleted(false);
permissionService.save(settingsAccess);
}
Permission settings_access = new Permission();
settings_access.setTag(PermissionName.SETTINGS_ACCESS);
settings_access.setDescription(PermissionDescription.SETTINGS_ACCESS);
}
}

60
sge-backend/src/main/java/com/sgs/graphql/dataCenter/domain/DataCenter.java
View File

@@ -2,10 +2,11 @@ package com.sgs.graphql.dataCenter.domain;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.sgs.graphql.area.domain.Area;
import com.sgs.graphql.city.domain.City;
import com.sgs.graphql.sector.domain.Sector;
import com.sgs.graphql.subSector.domain.SubSector;
import com.sgs.graphql.emissionSource.domain.EmissionSource;
import com.sgs.graphql.emissionScope.domain.EmissionScope;
import com.sgs.graphql.consuptionUnit.domain.ConsuptionUnit;
import com.sgs.graphql.activitySubUnit.domain.ActivitySubUnit;
import com.sgs.lib.dao.domain.BaseDomain;
@@ -13,8 +14,6 @@ import javax.persistence.*;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -30,14 +29,14 @@ public class DataCenter extends BaseDomain {
private Integer number;
private Area area;
private City city;
private List<PhysicalMachine> physicalMachines = new ArrayList<>();
private List<DataCenterEmissionSource> dataCenterEmissionSources = new ArrayList<>();
private List<Project> projects = new ArrayList<>();
private Sector sector;
private SubSector subSector;
private EmissionSource emissionSource;
private EmissionScope emissionScope;
private Double consuptionAmount;
private ConsuptionUnit consuptionUnit;
private ActivitySubUnit activitySubUnit;
// New attributes
@@ -64,23 +63,12 @@ public class DataCenter extends BaseDomain {
@OneToMany(mappedBy = "dataCenter", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
@JsonManagedReference
public List<PhysicalMachine> getPhysicalMachines() {
return physicalMachines;
public List<Project> getProjects() {
return projects;
}
public void setPhysicalMachines(List<PhysicalMachine> physicalMachines) {
this.physicalMachines = physicalMachines;
}
@OneToMany(mappedBy = "dataCenter", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
@Fetch(FetchMode.SUBSELECT)
@JsonManagedReference
public List<DataCenterEmissionSource> getDataCenterEmissionSources() {
return dataCenterEmissionSources;
}
public void setDataCenterEmissionSources(List<DataCenterEmissionSource> dataCenterEmissionSources) {
this.dataCenterEmissionSources = dataCenterEmissionSources;
public void setProjects(List<Project> projects) {
this.projects = projects;
}
public void setExternalId(Integer externalId) {
@@ -126,6 +114,16 @@ public class DataCenter extends BaseDomain {
this.consuptionAmount = consuptionAmount;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "consuption_unit_id")
public ConsuptionUnit getConsuptionUnit() {
return consuptionUnit;
}
public void setConsuptionUnit(ConsuptionUnit consuptionUnit) {
this.consuptionUnit = consuptionUnit;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "area_id")
public Area getArea() {
@@ -136,16 +134,6 @@ public class DataCenter extends BaseDomain {
this.area = area;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "city_id")
public City getCity() {
return city;
}
public void setCity(City city) {
this.city = city;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "sub_sector_id")
public SubSector getSubSector() {
@@ -156,6 +144,16 @@ public class DataCenter extends BaseDomain {
this.subSector = subSector;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "emission_source_id")
public EmissionSource getEmissionSource() {
return emissionSource;
}
public void setEmissionSource(EmissionSource emissionSource) {
this.emissionSource = emissionSource;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "activity_sub_unit_id")
public ActivitySubUnit getActivitySubUnit() {

68
sge-backend/src/main/java/com/sgs/graphql/dataCenter/domain/DataCenterEmissionSource.java
View File

@@ -1,68 +0,0 @@
package com.sgs.graphql.dataCenter.domain;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.sgs.graphql.emissionSource.domain.EmissionSource;
import com.sgs.graphql.consuptionUnit.domain.ConsuptionUnit;
import com.sgs.lib.dao.domain.BaseDomain;
import javax.persistence.*;
@Entity
@Table(name = "data_center_emission_source")
public class DataCenterEmissionSource extends BaseDomain {
private DataCenter dataCenter;
private EmissionSource emissionSource;
private ConsuptionUnit consuptionUnit;
private Boolean isDefault = false; // To mark which one is the default emission source
private Double percentage; // Percentage allocation for this emission source (optional)
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "data_center_id", nullable = false)
@JsonBackReference
public DataCenter getDataCenter() {
return dataCenter;
}
public void setDataCenter(DataCenter dataCenter) {
this.dataCenter = dataCenter;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "emission_source_id", nullable = false)
public EmissionSource getEmissionSource() {
return emissionSource;
}
public void setEmissionSource(EmissionSource emissionSource) {
this.emissionSource = emissionSource;
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "consuption_unit_id", nullable = false)
public ConsuptionUnit getConsuptionUnit() {
return consuptionUnit;
}
public void setConsuptionUnit(ConsuptionUnit consuptionUnit) {
this.consuptionUnit = consuptionUnit;
}
@Column(name = "is_default")
public Boolean getIsDefault() {
return isDefault;
}
public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault;
}
@Column(name = "percentage")
public Double getPercentage() {
return percentage;
}
public void setPercentage(Double percentage) {
this.percentage = percentage;
}
}

22
sge-backend/src/main/java/com/sgs/graphql/dataCenter/domain/PhysicalMachine.java
View File

@@ -14,10 +14,9 @@ public class PhysicalMachine extends BaseDomain {
private String name;
private String ip;
private String tag;
private String cloudSystem;
private Double power;
private List<VM> vms = new ArrayList<>();
private DataCenter dataCenter;
private Project project;
@Column(name = "name")
public String getName() {
@@ -46,15 +45,6 @@ public class PhysicalMachine extends BaseDomain {
this.tag = tag;
}
@Column(name = "cloud_system")
public String getCloudSystem() {
return cloudSystem;
}
public void setCloudSystem(String cloudSystem) {
this.cloudSystem = cloudSystem;
}
@Column(name = "power")
public Double getPower() {
return power;
@@ -75,13 +65,13 @@ public class PhysicalMachine extends BaseDomain {
}
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "data_center_id")
@JoinColumn(name = "project_id")
@JsonBackReference
public DataCenter getDataCenter() {
return dataCenter;
public Project getProject() {
return project;
}
public void setDataCenter(DataCenter dataCenter) {
this.dataCenter = dataCenter;
public void setProject(Project project) {
this.project = project;
}
}

50
sge-backend/src/main/java/com/sgs/graphql/dataCenter/domain/Project.java Normal file
View File

@@ -0,0 +1,50 @@
package com.sgs.graphql.dataCenter.domain;
import java.util.List;
import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.sgs.lib.dao.domain.BaseDomain;
@Entity
@Table(name = "project")
public class Project extends BaseDomain{
private String name;
private List<PhysicalMachine> physicalMachines;
@OneToMany(mappedBy = "project", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JsonManagedReference
public List<PhysicalMachine> getPhysicalMachines() {
return physicalMachines;
}
public void setPhysicalMachines(List<PhysicalMachine> physicalMachines) {
this.physicalMachines = physicalMachines;
}
// This creates a foreign key in the `project` table
private DataCenter dataCenter;
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@ManyToOne
@JoinColumn(name = "data_center_id")
@JsonBackReference
public DataCenter getDataCenter() {
return dataCenter;
}
public void setDataCenter(DataCenter dataCenter) {
this.dataCenter = dataCenter;
}
}

10
sge-backend/src/main/java/com/sgs/graphql/dataCenter/domain/VM.java
View File

@@ -23,7 +23,6 @@ public class VM extends BaseDomain {
private String host;
private String flavorName;
private String tag;
private String project; // UUID of the project this VM belongs to
private String emissionSourceData; // JSON string to store emission source map
private Config config;
private PhysicalMachine physicalMachine;
@@ -101,15 +100,6 @@ public class VM extends BaseDomain {
this.tag = tag;
}
@Column(name = "project")
public String getProject() {
return project;
}
public void setProject(String project) {
this.project = project;
}
@Column(name = "ip")
public String getIp() {
return ip;

12
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/DataCenterDto.java
View File

@@ -17,9 +17,7 @@ public class DataCenterDto {
private Integer externalId;
private Integer number;
private AreaDto area;
@JsonProperty("physical_machines")
private Map<String, PhysicalMachineDto> physicalMachine;
private Map<String, ProjectDto> projects;
// Emission calculation fields
private SectorDto sector;
@@ -70,12 +68,12 @@ public class DataCenterDto {
this.area = area;
}
public Map<String, PhysicalMachineDto> getPhysicalMachine() {
return physicalMachine;
public Map<String, ProjectDto> getProjects() {
return projects;
}
public void setPhysicalMachine(Map<String, PhysicalMachineDto> physicalMachine) {
this.physicalMachine = physicalMachine;
public void setProjects(Map<String, ProjectDto> projects) {
this.projects = projects;
}
public SectorDto getSector() {

50
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/DataCenterEmissionSourceDto.java
View File

@@ -1,50 +0,0 @@
package com.sgs.graphql.dataCenter.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
public class DataCenterEmissionSourceDto {
@JsonProperty("emission_source_id")
private String emissionSourceId;
@JsonProperty("consuption_unit_id")
private String consuptionUnitId;
@JsonProperty("is_default")
private Boolean isDefault = false;
@JsonProperty("percentage")
private Double percentage;
public String getEmissionSourceId() {
return emissionSourceId;
}
public void setEmissionSourceId(String emissionSourceId) {
this.emissionSourceId = emissionSourceId;
}
public String getConsuptionUnitId() {
return consuptionUnitId;
}
public void setConsuptionUnitId(String consuptionUnitId) {
this.consuptionUnitId = consuptionUnitId;
}
public Boolean getIsDefault() {
return isDefault;
}
public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault;
}
public Double getPercentage() {
return percentage;
}
public void setPercentage(Double percentage) {
this.percentage = percentage;
}
}

24
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/MainOptimizationSpaceDto.java Normal file
View File

@@ -0,0 +1,24 @@
package com.sgs.graphql.dataCenter.dto;
import java.util.Map;
public class MainOptimizationSpaceDto {
private Map<String, VMDto> vms;
private Map<String, PhysicalMachineDto> pms;
public Map<String, VMDto> getVms() {
return vms;
}
public void setVms(Map<String, VMDto> vms) {
this.vms = vms;
}
public Map<String, PhysicalMachineDto> getPms() {
return pms;
}
public void setPms(Map<String, PhysicalMachineDto> pms) {
this.pms = pms;
}
}

23
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/PhysicalMachineDto.java
View File

@@ -2,7 +2,6 @@ package com.sgs.graphql.dataCenter.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import java.util.Map;
public class PhysicalMachineDto {
@JsonProperty("name")
@@ -11,18 +10,12 @@ public class PhysicalMachineDto {
@JsonProperty("tag")
private String tag;
@JsonProperty("cloud_system")
private String cloudSystem;
@JsonProperty("power")
private double power;
@JsonProperty("confg") // Note: keeping the typo from JSON
private List<Object> confg;
@JsonProperty("vms")
private Map<String, VMDto> vms;
private String ip; // IP address from the message key
public String getName() {
@@ -41,14 +34,6 @@ public class PhysicalMachineDto {
this.tag = tag;
}
public String getCloudSystem() {
return cloudSystem;
}
public void setCloudSystem(String cloudSystem) {
this.cloudSystem = cloudSystem;
}
public double getPower() {
return power;
}
@@ -72,12 +57,4 @@ public class PhysicalMachineDto {
public void setIp(String ip) {
this.ip = ip;
}
public Map<String, VMDto> getVms() {
return vms;
}
public void setVms(Map<String, VMDto> vms) {
this.vms = vms;
}
}

61
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/ProjectDto.java Normal file
View File

@@ -0,0 +1,61 @@
package com.sgs.graphql.dataCenter.dto;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ProjectDto {
@JsonProperty("main_optimization_space")
private MainOptimizationSpaceDto mainOptimizationSpace;
@JsonProperty("sub_optimization_space")
private SubOptimizationSpaceDto subOptimizationSpace;
// Legacy field - kept for backward compatibility with older message formats
@JsonProperty("physical_machines")
private List<PhysicalMachineDto> physicalMachines;
// These fields are derived from the map key and entity relationships, not from the message
private String id; // This will be set from the map key
private String name; // This will be derived or set separately
public MainOptimizationSpaceDto getMainOptimizationSpace() {
return mainOptimizationSpace;
}
public void setMainOptimizationSpace(MainOptimizationSpaceDto mainOptimizationSpace) {
this.mainOptimizationSpace = mainOptimizationSpace;
}
public SubOptimizationSpaceDto getSubOptimizationSpace() {
return subOptimizationSpace;
}
public void setSubOptimizationSpace(SubOptimizationSpaceDto subOptimizationSpace) {
this.subOptimizationSpace = subOptimizationSpace;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public List<PhysicalMachineDto> getPhysicalMachines() {
return physicalMachines;
}
public void setPhysicalMachines(List<PhysicalMachineDto> physicalMachines) {
this.physicalMachines = physicalMachines;
}
}

24
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/SubOptimizationSpaceDto.java Normal file
View File

@@ -0,0 +1,24 @@
package com.sgs.graphql.dataCenter.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* DTO for sub_optimization_space in the message format.
* Currently appears to be empty in the message structure.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class SubOptimizationSpaceDto {
// Currently empty based on the message format
// Can be extended if needed in the future
// Add a placeholder field to make Jackson happy
private boolean isEmpty = true;
public boolean isEmpty() {
return isEmpty;
}
public void setEmpty(boolean empty) {
this.isEmpty = empty;
}
}

11
sge-backend/src/main/java/com/sgs/graphql/dataCenter/dto/VMDto.java
View File

@@ -26,9 +26,6 @@ public class VMDto {
@JsonProperty("tag")
private String tag;
@JsonProperty("project")
private String project;
@JsonProperty("confg") // Note: keeping the typo from JSON
private List<Object> confg;
@@ -104,14 +101,6 @@ public class VMDto {
this.tag = tag;
}
public String getProject() {
return project;
}
public void setProject(String project) {
this.project = project;
}
public List<Object> getConfg() {
return confg;
}

21
sge-backend/src/main/java/com/sgs/graphql/dataCenter/mutation/input/DataCenterCreateInput.java
View File

@@ -5,7 +5,6 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Min;
import java.util.UUID;
import java.util.List;
public class DataCenterCreateInput extends BaseCreateInput {
@NotBlank(message = "Data center adı gereklidir")
@@ -16,21 +15,17 @@ public class DataCenterCreateInput extends BaseCreateInput {
private Integer number;
private Double consuptionAmount;
@NotNull(message = "Alan ID gereklidir")
private UUID areaId;
private UUID cityId;
@NotNull(message = "Sektör ID gereklidir")
private UUID sectorId;
private UUID subSectorId;
private UUID emissionSourceId;
private UUID emissionScopeId;
private UUID consuptionUnitId;
private UUID activitySubUnitId;
// Multiple emission sources support - each with exactly one unit
private List<DataCenterEmissionSourceInput> dataCenterEmissionSources;
// New attributes
private String ayposURL;
private String address;
@@ -53,24 +48,24 @@ public class DataCenterCreateInput extends BaseCreateInput {
public UUID getAreaId() { return areaId; }
public void setAreaId(UUID areaId) { this.areaId = areaId; }
public UUID getCityId() { return cityId; }
public void setCityId(UUID cityId) { this.cityId = cityId; }
public UUID getSectorId() { return sectorId; }
public void setSectorId(UUID sectorId) { this.sectorId = sectorId; }
public UUID getSubSectorId() { return subSectorId; }
public void setSubSectorId(UUID subSectorId) { this.subSectorId = subSectorId; }
public UUID getEmissionSourceId() { return emissionSourceId; }
public void setEmissionSourceId(UUID emissionSourceId) { this.emissionSourceId = emissionSourceId; }
public UUID getEmissionScopeId() { return emissionScopeId; }
public void setEmissionScopeId(UUID emissionScopeId) { this.emissionScopeId = emissionScopeId; }
public UUID getConsuptionUnitId() { return consuptionUnitId; }
public void setConsuptionUnitId(UUID consuptionUnitId) { this.consuptionUnitId = consuptionUnitId; }
public UUID getActivitySubUnitId() { return activitySubUnitId; }
public void setActivitySubUnitId(UUID activitySubUnitId) { this.activitySubUnitId = activitySubUnitId; }
public List<DataCenterEmissionSourceInput> getDataCenterEmissionSources() { return dataCenterEmissionSources; }
public void setDataCenterEmissionSources(List<DataCenterEmissionSourceInput> dataCenterEmissionSources) { this.dataCenterEmissionSources = dataCenterEmissionSources; }
// New attribute getters and setters
public String getAyposURL() { return ayposURL; }
public void setAyposURL(String ayposURL) { this.ayposURL = ayposURL; }

40
sge-backend/src/main/java/com/sgs/graphql/dataCenter/mutation/input/DataCenterEmissionSourceInput.java
View File

@@ -1,40 +0,0 @@
package com.sgs.graphql.dataCenter.mutation.input;
public class DataCenterEmissionSourceInput {
private String emissionSourceId;
private String consuptionUnitId;
private Boolean isDefault = false;
private Double percentage;
public String getEmissionSourceId() {
return emissionSourceId;
}
public void setEmissionSourceId(String emissionSourceId) {
this.emissionSourceId = emissionSourceId;
}
public String getConsuptionUnitId() {
return consuptionUnitId;
}
public void setConsuptionUnitId(String consuptionUnitId) {
this.consuptionUnitId = consuptionUnitId;
}
public Boolean getIsDefault() {
return isDefault;
}
public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault;
}
public Double getPercentage() {
return percentage;
}
public void setPercentage(Double percentage) {
this.percentage = percentage;
}
}

25
sge-backend/src/main/java/com/sgs/graphql/dataCenter/mutation/input/DataCenterUpdateInput.java
View File

@@ -1,7 +1,7 @@
package com.sgs.graphql.dataCenter.mutation.input;
import com.sgs.lib.dao.mutation.input.BaseUpdateInput;
import java.util.List;
import javax.validation.constraints.NotNull;
import java.util.UUID;
public class DataCenterUpdateInput extends BaseUpdateInput {
@@ -11,15 +11,14 @@ public class DataCenterUpdateInput extends BaseUpdateInput {
private Double consuptionAmount;
private UUID areaId;
private UUID cityId;
@NotNull(message = "Sektör ID gereklidir")
private UUID sectorId;
private UUID subSectorId;
private UUID emissionSourceId;
private UUID emissionScopeId;
private UUID consuptionUnitId;
private UUID activitySubUnitId;
// Multiple emission sources with units
private List<DataCenterEmissionSourceInput> dataCenterEmissionSources;
// New attributes
private String ayposURL;
private String address;
@@ -42,28 +41,24 @@ public class DataCenterUpdateInput extends BaseUpdateInput {
public UUID getAreaId() { return areaId; }
public void setAreaId(UUID areaId) { this.areaId = areaId; }
public UUID getCityId() { return cityId; }
public void setCityId(UUID cityId) { this.cityId = cityId; }
public UUID getSectorId() { return sectorId; }
public void setSectorId(UUID sectorId) { this.sectorId = sectorId; }
public UUID getSubSectorId() { return subSectorId; }
public void setSubSectorId(UUID subSectorId) { this.subSectorId = subSectorId; }
public UUID getEmissionSourceId() { return emissionSourceId; }
public void setEmissionSourceId(UUID emissionSourceId) { this.emissionSourceId = emissionSourceId; }
public UUID getEmissionScopeId() { return emissionScopeId; }
public void setEmissionScopeId(UUID emissionScopeId) { this.emissionScopeId = emissionScopeId; }
public UUID getConsuptionUnitId() { return consuptionUnitId; }
public void setConsuptionUnitId(UUID consuptionUnitId) { this.consuptionUnitId = consuptionUnitId; }
public UUID getActivitySubUnitId() { return activitySubUnitId; }
public void setActivitySubUnitId(UUID activitySubUnitId) { this.activitySubUnitId = activitySubUnitId; }
public List<DataCenterEmissionSourceInput> getDataCenterEmissionSources() {
return dataCenterEmissionSources;
}
public void setDataCenterEmissionSources(List<DataCenterEmissionSourceInput> dataCenterEmissionSources) {
this.dataCenterEmissionSources = dataCenterEmissionSources;
}
// New attribute getters and setters
public String getAyposURL() { return ayposURL; }
public void setAyposURL(String ayposURL) { this.ayposURL = ayposURL; }

86
sge-backend/src/main/java/com/sgs/graphql/dataCenter/mutation/mapper/DataCenterMapper.java
View File

@@ -1,10 +1,8 @@
package com.sgs.graphql.dataCenter.mutation.mapper;
import com.sgs.graphql.dataCenter.domain.DataCenter;
import com.sgs.graphql.dataCenter.domain.DataCenterEmissionSource;
import com.sgs.graphql.dataCenter.mutation.input.DataCenterCreateInput;
import com.sgs.graphql.dataCenter.mutation.input.DataCenterUpdateInput;
import com.sgs.graphql.dataCenter.mutation.input.DataCenterEmissionSourceInput;
import com.sgs.graphql.area.service.AreaService;
import com.sgs.graphql.sector.service.SectorService;
import com.sgs.graphql.subSector.service.SubSectorService;
@@ -12,13 +10,9 @@ import com.sgs.graphql.emissionSource.service.EmissionSourceService;
import com.sgs.graphql.emissionScope.service.EmissionScopeService;
import com.sgs.graphql.consuptionUnit.service.ConsuptionUnitService;
import com.sgs.graphql.activitySubUnit.service.ActivitySubUnitService;
import com.sgs.graphql.city.service.CityService;
import com.sgs.lib.dao.mutation.mapper.BaseCreateUpdateMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.ArrayList;
import java.util.UUID;
@Component
public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCenterCreateInput, DataCenterUpdateInput> {
@@ -30,13 +24,12 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
private final EmissionScopeService emissionScopeService;
private final ConsuptionUnitService consuptionUnitService;
private final ActivitySubUnitService activitySubUnitService;
private final CityService cityService;
@Autowired
public DataCenterMapper(AreaService areaService, SectorService sectorService,
SubSectorService subSectorService, EmissionSourceService emissionSourceService,
EmissionScopeService emissionScopeService, ConsuptionUnitService consuptionUnitService,
ActivitySubUnitService activitySubUnitService, CityService cityService) {
ActivitySubUnitService activitySubUnitService) {
this.areaService = areaService;
this.sectorService = sectorService;
this.subSectorService = subSectorService;
@@ -44,7 +37,6 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
this.emissionScopeService = emissionScopeService;
this.consuptionUnitService = consuptionUnitService;
this.activitySubUnitService = activitySubUnitService;
this.cityService = cityService;
}
@Override
@@ -61,9 +53,6 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
if (input.getAreaId() != null) {
entity.setArea(areaService.findById(input.getAreaId()).orElse(null));
}
if (input.getCityId() != null) {
entity.setCity(cityService.findById(input.getCityId()).orElse(null));
}
if (input.getSectorId() != null) {
entity.setSector(sectorService.findById(input.getSectorId()).orElse(null));
@@ -73,10 +62,18 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
entity.setSubSector(subSectorService.findById(input.getSubSectorId()).orElse(null));
}
if (input.getEmissionSourceId() != null) {
entity.setEmissionSource(emissionSourceService.findById(input.getEmissionSourceId()).orElse(null));
}
if (input.getEmissionScopeId() != null) {
entity.setEmissionScope(emissionScopeService.findById(input.getEmissionScopeId()).orElse(null));
}
if (input.getConsuptionUnitId() != null) {
entity.setConsuptionUnit(consuptionUnitService.findById(input.getConsuptionUnitId()).orElse(null));
}
if (input.getActivitySubUnitId() != null) {
entity.setActivitySubUnit(activitySubUnitService.findById(input.getActivitySubUnitId()).orElse(null));
}
@@ -87,34 +84,6 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
entity.setLatitude(input.getLatitude());
entity.setLongitude(input.getLongitude());
// Handle multiple emission sources if provided
if (input.getDataCenterEmissionSources() != null && !input.getDataCenterEmissionSources().isEmpty()) {
List<DataCenterEmissionSource> dataCenterEmissionSources = new ArrayList<>();
for (DataCenterEmissionSourceInput emissionSourceInput : input.getDataCenterEmissionSources()) {
DataCenterEmissionSource dcEmissionSource = new DataCenterEmissionSource();
dcEmissionSource.setDataCenter(entity);
// Set EmissionSource
if (emissionSourceInput.getEmissionSourceId() != null) {
dcEmissionSource.setEmissionSource(emissionSourceService.findById(UUID.fromString(emissionSourceInput.getEmissionSourceId())).orElse(null));
}
// Set ConsuptionUnit
if (emissionSourceInput.getConsuptionUnitId() != null) {
dcEmissionSource.setConsuptionUnit(consuptionUnitService.findById(UUID.fromString(emissionSourceInput.getConsuptionUnitId())).orElse(null));
}
// Set optional fields
dcEmissionSource.setIsDefault(emissionSourceInput.getIsDefault() != null ? emissionSourceInput.getIsDefault() : false);
dcEmissionSource.setPercentage(emissionSourceInput.getPercentage());
dataCenterEmissionSources.add(dcEmissionSource);
}
entity.setDataCenterEmissionSources(dataCenterEmissionSources);
}
return entity;
}
@@ -141,9 +110,6 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
if (input.getAreaId() != null) {
entity.setArea(areaService.findById(input.getAreaId()).orElse(null));
}
if (input.getCityId() != null) {
entity.setCity(cityService.findById(input.getCityId()).orElse(null));
}
if (input.getSectorId() != null) {
entity.setSector(sectorService.findById(input.getSectorId()).orElse(null));
@@ -153,40 +119,22 @@ public class DataCenterMapper extends BaseCreateUpdateMapper<DataCenter, DataCen
entity.setSubSector(subSectorService.findById(input.getSubSectorId()).orElse(null));
}
if (input.getEmissionSourceId() != null) {
entity.setEmissionSource(emissionSourceService.findById(input.getEmissionSourceId()).orElse(null));
}
if (input.getEmissionScopeId() != null) {
entity.setEmissionScope(emissionScopeService.findById(input.getEmissionScopeId()).orElse(null));
}
if (input.getConsuptionUnitId() != null) {
entity.setConsuptionUnit(consuptionUnitService.findById(input.getConsuptionUnitId()).orElse(null));
}
if (input.getActivitySubUnitId() != null) {
entity.setActivitySubUnit(activitySubUnitService.findById(input.getActivitySubUnitId()).orElse(null));
}
// Handle multiple emission sources update if provided
if (input.getDataCenterEmissionSources() != null) {
// Clear existing emission sources and add new ones
entity.getDataCenterEmissionSources().clear();
List<DataCenterEmissionSource> dataCenterEmissionSources = new ArrayList<>();
for (DataCenterEmissionSourceInput emissionSourceInput : input.getDataCenterEmissionSources()) {
DataCenterEmissionSource dcEmissionSource = new DataCenterEmissionSource();
dcEmissionSource.setDataCenter(entity);
if (emissionSourceInput.getEmissionSourceId() != null) {
dcEmissionSource.setEmissionSource(emissionSourceService.findById(UUID.fromString(emissionSourceInput.getEmissionSourceId())).orElse(null));
}
if (emissionSourceInput.getConsuptionUnitId() != null) {
dcEmissionSource.setConsuptionUnit(consuptionUnitService.findById(UUID.fromString(emissionSourceInput.getConsuptionUnitId())).orElse(null));
}
dcEmissionSource.setIsDefault(emissionSourceInput.getIsDefault() != null ? emissionSourceInput.getIsDefault() : false);
dcEmissionSource.setPercentage(emissionSourceInput.getPercentage());
dataCenterEmissionSources.add(dcEmissionSource);
}
entity.setDataCenterEmissionSources(dataCenterEmissionSources);
}
// New attributes (partial update - only if provided)
if (input.getAyposURL() != null) {
entity.setAyposURL(input.getAyposURL());

10
sge-backend/src/main/java/com/sgs/graphql/dataCenter/query/DataCenterQueryResolver.java
View File

@@ -15,10 +15,8 @@ import org.springframework.stereotype.Component;
import com.sgs.graphql.auth.service.AuthorizationService;
import com.sgs.graphql.dataCenter.domain.DataCenter;
import com.sgs.graphql.dataCenter.domain.PhysicalMachine;
import com.sgs.graphql.dataCenter.query.pagination.DataCenterPageable;
import com.sgs.graphql.dataCenter.repo.DataCenterRepo;
import com.sgs.graphql.dataCenter.repo.PhysicalMachineRepo;
import com.sgs.graphql.dataCenter.repo.criteria.DataCenterCriteria;
import com.sgs.graphql.dataCenter.service.DataCenterService;
import com.sgs.graphql.systemHistory.mutation.SystemLogger;
@@ -32,15 +30,13 @@ public class DataCenterQueryResolver implements GraphQLQueryResolver {
private final DataCenterService DataCenterService;
private final DataCenterRepo dataCenterRepo;
private final PhysicalMachineRepo physicalMachineRepo;
private final AuthorizationService authorizationService;
private final SystemLogger systemLogger;
@Autowired
public DataCenterQueryResolver(AuthorizationService authorizationService, SystemLogger systemLogger, DataCenterService DataCenterService, DataCenterRepo dataCenterRepo, PhysicalMachineRepo physicalMachineRepo) {
public DataCenterQueryResolver(AuthorizationService authorizationService, SystemLogger systemLogger, DataCenterService DataCenterService, DataCenterRepo dataCenterRepo) {
this.DataCenterService = DataCenterService;
this.dataCenterRepo = dataCenterRepo;
this.physicalMachineRepo = physicalMachineRepo;
this.authorizationService = authorizationService;
this.systemLogger = systemLogger;
}
@@ -70,8 +66,4 @@ public class DataCenterQueryResolver implements GraphQLQueryResolver {
return dataCenterRepo.findByNumber(id).stream().findFirst();
}
public List<PhysicalMachine> physicalMachines(UUID datacenterId) {
return physicalMachineRepo.findByDatacenterId(datacenterId);
}
}

24
sge-backend/src/main/java/com/sgs/graphql/dataCenter/repo/DataCenterEmissionSourceRepo.java
View File

@@ -1,24 +0,0 @@
package com.sgs.graphql.dataCenter.repo;
import com.sgs.graphql.dataCenter.domain.DataCenter;
import com.sgs.graphql.dataCenter.domain.DataCenterEmissionSource;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface DataCenterEmissionSourceRepo extends JpaRepository<DataCenterEmissionSource, String> {
List<DataCenterEmissionSource> findByDataCenter(DataCenter dataCenter);
Optional<DataCenterEmissionSource> findByDataCenterAndIsDefaultTrue(DataCenter dataCenter);
@Query("SELECT dces FROM DataCenterEmissionSource dces WHERE dces.dataCenter.id = :dataCenterId")
List<DataCenterEmissionSource> findByDataCenterId(@Param("dataCenterId") String dataCenterId);
void deleteByDataCenter(DataCenter dataCenter);
}

22
sge-backend/src/main/java/com/sgs/graphql/dataCenter/repo/PhysicalMachineRepo.java
View File

@@ -1,22 +0,0 @@
package com.sgs.graphql.dataCenter.repo;
import com.sgs.graphql.dataCenter.domain.PhysicalMachine;
import com.sgs.lib.dao.repo.BaseRepo;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.UUID;
@Repository
public interface PhysicalMachineRepo extends BaseRepo<PhysicalMachine> {
/**
* Find all physical machines by datacenter ID
* @param datacenterId Datacenter ID
* @return List of physical machines
*/
@Query("SELECT pm FROM PhysicalMachine pm WHERE pm.dataCenter.id = :datacenterId")
List<PhysicalMachine> findByDatacenterId(@Param("datacenterId") UUID datacenterId);
}

10
sge-backend/src/main/java/com/sgs/graphql/mainDataTable/dto/VMEmissionSummary.java
View File

@@ -15,7 +15,7 @@ public class VMEmissionSummary {
private Double totalEmission; // Individual record's total emission
private LocalDateTime createdDate; // When this specific record was created
private String physicalMachine;
private String cloudSystem; // From physical machine
private String project;
private String dataCenter;
// Individual emission values for this specific record
@@ -31,7 +31,7 @@ public class VMEmissionSummary {
public VMEmissionSummary(UUID vmId, String vmName, Double vmPower, String vmStatus,
Double totalEmission, LocalDateTime createdDate,
String physicalMachine, String cloudSystem, String dataCenter,
String physicalMachine, String project, String dataCenter,
Double co2, Double ch4, Double n2o) {
this.vmId = vmId;
this.vmName = vmName;
@@ -40,7 +40,7 @@ public class VMEmissionSummary {
this.totalEmission = totalEmission;
this.createdDate = createdDate;
this.physicalMachine = physicalMachine;
this.cloudSystem = cloudSystem;
this.project = project;
this.dataCenter = dataCenter;
this.co2 = co2;
this.ch4 = ch4;
@@ -70,8 +70,8 @@ public class VMEmissionSummary {
public String getPhysicalMachine() { return physicalMachine; }
public void setPhysicalMachine(String physicalMachine) { this.physicalMachine = physicalMachine; }
public String getCloudSystem() { return cloudSystem; }
public void setCloudSystem(String cloudSystem) { this.cloudSystem = cloudSystem; }
public String getProject() { return project; }
public void setProject(String project) { this.project = project; }
public String getDataCenter() { return dataCenter; }
public void setDataCenter(String dataCenter) { this.dataCenter = dataCenter; }

6
sge-backend/src/main/java/com/sgs/graphql/mainDataTable/query/MainDataTableQueryResolver.java
View File

@@ -51,11 +51,9 @@ public class MainDataTableQueryResolver implements GraphQLQueryResolver {
/**
* GraphQL query to get VM emission summaries with hierarchy information
* @param datacenterId Optional datacenter ID to filter VMs by datacenter
* @param projectId Optional project ID to filter VMs by project
* @return List of VM emission summaries including datacenter, project, aggregate, and physical machine info
*/
public List<VMEmissionSummary> vmEmissionSummary(UUID datacenterId) {
return mainDataTableService.getVMEmissionSummaries(datacenterId);
public List<VMEmissionSummary> vmEmissionSummary() {
return mainDataTableService.getVMEmissionSummaries();
}
}

38
sge-backend/src/main/java/com/sgs/graphql/mainDataTable/service/MainDataTableService.java
View File

@@ -9,7 +9,6 @@ import com.sgs.lib.dao.service.BaseService;
import com.sgs.graphql.mainDataTable.dto.VMEmissionSummary;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -33,48 +32,31 @@ public class MainDataTableService extends BaseService<MainDataTable, MainDataTab
}
public List<VMEmissionSummary> getVMEmissionSummaries() {
return getVMEmissionSummaries(null);
}
public List<VMEmissionSummary> getVMEmissionSummaries(UUID datacenterId) {
List<String> whereConditions = new ArrayList<>();
if (datacenterId != null) {
whereConditions.add("dc.id = decode(replace(:datacenterId, '-', ''), 'hex')");
}
String whereClause = whereConditions.isEmpty() ? "" :
"WHERE " + String.join(" AND ", whereConditions) + " ";
String sql = """
SELECT
CAST(v.id AS VARCHAR) as vm_id,
v.vm_name as vm_name,
v.name as vm_name,
v.power as vm_power,
v.state as vm_status,
v.status as vm_status,
mdt.total_emission,
mdt.created_date,
pm.name as physical_machine_name,
pm.cloud_system as cloud_system,
p.name as project_name,
dc.data_center_name as datacenter_name,
mdt.co2,
mdt.ch4,
mdt.n2o
FROM main_data_table mdt
JOIN vm v ON mdt.vm_id = v.id
LEFT JOIN physical_machine pm ON v.physical_machine_id = pm.id
LEFT JOIN data_center dc ON pm.data_center_id = dc.id
""" + whereClause + """
ORDER BY mdt.created_date DESC, v.vm_name
LEFT JOIN vms vms_active ON v.active_vms_id = vms_active.id
LEFT JOIN vms vms_inactive ON v.inactive_vms_id = vms_inactive.id
LEFT JOIN physical_machine pm ON (pm.vms_id = vms_active.id OR pm.vms_id = vms_inactive.id)
LEFT JOIN project p ON pm.project_id = p.id
LEFT JOIN data_center dc ON p.data_center_id = dc.id
ORDER BY mdt.created_date DESC, v.name
""";
Query query = entityManager.createNativeQuery(sql);
// Add parameters if provided
if (datacenterId != null) {
query.setParameter("datacenterId", datacenterId.toString());
}
@SuppressWarnings("unchecked")
List<Object[]> results = query.getResultList();
@@ -98,7 +80,7 @@ public class MainDataTableService extends BaseService<MainDataTable, MainDataTab
}
summary.setPhysicalMachine((String) row[6]);
summary.setCloudSystem((String) row[7]);
summary.setProject((String) row[7]);
summary.setDataCenter((String) row[8]);
// Individual emission values

1
sge-backend/src/main/java/com/sgs/graphql/permission/domain/PermissionDescription.java
View File

@@ -74,5 +74,4 @@ public class PermissionDescription {
public static final String DATA_CENTER_DELETE = "Veri Merkezi Silme";
public static final String DATA_CENTER_UPDATE = "Veri Merkezi Güncelleme";
public static final String DATA_CENTER_READ = "Veri Merkezi Görüntüleme";
public static final String PAGINATE_DATACENTERS_GET = "Veri Merkezleri Listesi Görüntüleme";
}

1
sge-backend/src/main/java/com/sgs/graphql/permission/domain/PermissionName.java
View File

@@ -84,6 +84,5 @@ public class PermissionName {
public static final String DATA_CENTER_DELETE = "data_center_delete";
public static final String DATA_CENTER_UPDATE = "data_center_update";
public static final String DATA_CENTER_READ = "data_center_read";
public static final String PAGINATE_DATACENTERS_GET = "paginate_datacenters_get";
}

6
sge-backend/src/main/java/com/sgs/graphql/permission/service/PermissionService.java
View File

@@ -9,8 +9,6 @@ import com.sgs.lib.dao.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
public class PermissionService extends BaseService<Permission, PermissionRepo, PermissionCriteria, PermissionCriteriaSpec> {
@@ -18,8 +16,4 @@ public class PermissionService extends BaseService<Permission, PermissionRepo, P
public PermissionService(PermissionRepo repository, PermissionCriteriaSpec criteriaSpec) {
super(repository, criteriaSpec);
}
public Optional<Permission> findByTag(String tag) {
return getRepository().findByTag(tag);
}
}

415
sge-backend/src/main/java/com/sgs/utils/rabbitMQ/MessageListener.java
View File

@@ -74,16 +74,19 @@ public class MessageListener {
System.out.println(" External ID: " + dto.getId());
System.out.println(" Number: " + dto.getNumber());
System.out.println(" Consumption Amount: " + dto.getConsuptionAmount());
System.out.println(" Physical Machines Count: " + (dto.getPhysicalMachine() != null ? dto.getPhysicalMachine().size() : 0));
System.out.println(" Projects Count: " + (dto.getProjects() != null ? dto.getProjects().size() : 0));
// Log Physical Machine info
if (dto.getPhysicalMachine() != null) {
for (Map.Entry<String, PhysicalMachineDto> pmEntry : dto.getPhysicalMachine().entrySet()) {
String pmIp = pmEntry.getKey();
PhysicalMachineDto pm = pmEntry.getValue();
System.out.println(" Physical Machine " + pm.getName() + " (IP: " + pmIp + "):");
System.out.println(" Power: " + pm.getPower());
System.out.println(" VMs: " + (pm.getVms() != null ? pm.getVms().size() : 0));
// Log MainOptimizationSpace info for each project
if (dto.getProjects() != null) {
for (Map.Entry<String, ProjectDto> projectEntry : dto.getProjects().entrySet()) {
String projectId = projectEntry.getKey();
ProjectDto project = projectEntry.getValue();
if (project.getMainOptimizationSpace() != null) {
MainOptimizationSpaceDto mainOpt = project.getMainOptimizationSpace();
System.out.println(" Project " + projectId + ":");
System.out.println(" PMs: " + (mainOpt.getPms() != null ? mainOpt.getPms().size() : 0));
System.out.println(" VMs: " + (mainOpt.getVms() != null ? mainOpt.getVms().size() : 0));
}
}
}
@@ -100,18 +103,18 @@ public class MessageListener {
// System.out.println(entity.toString());
System.out.println("✅ Raw JSON message:\n" + message);
//System.out.println("✅ DTO parsed:\n" + objectMapper.writeValueAsString(dto));
System.out.println("✅ DTO parsed:\n" + objectMapper.writeValueAsString(dto));
//System.out.println("✅ Entity:\n" + objectMapper.writeValueAsString(entity));
System.out.println("🚨 DataCenter name: " + dataCenter.getDataCenter());
System.out.println("🚨 External ID: " + dataCenter.getExternalId());
System.out.println("🚨 Physical Machines count: " + (dataCenter.getPhysicalMachines() != null ? dataCenter.getPhysicalMachines().size() : 0));
if (dataCenter.getPhysicalMachines() != null && !dataCenter.getPhysicalMachines().isEmpty()) {
PhysicalMachine firstPM = dataCenter.getPhysicalMachines().get(0);
System.out.println("🚨 VMs in first PM: " + firstPM.getVms().size());
System.out.println("🚨 Projects count: " + (dataCenter.getProjects() != null ? dataCenter.getProjects().size() : 0));
if (dataCenter.getProjects() != null && !dataCenter.getProjects().isEmpty()) {
Project firstProject = dataCenter.getProjects().get(0);
System.out.println("🚨 PMs in first project: " + firstProject.getPhysicalMachines().size());
// Show VM assignment summary
int totalVMs = 0;
for (PhysicalMachine pm : dataCenter.getPhysicalMachines()) {
for (PhysicalMachine pm : firstProject.getPhysicalMachines()) {
int vmCount = pm.getVms() != null ? pm.getVms().size() : 0;
totalVMs += vmCount;
System.out.println(" PM " + pm.getName() + " (IP: " + pm.getIp() + "): " + vmCount + " VMs");
@@ -154,7 +157,6 @@ public class MessageListener {
entity.setHost(dto.getHost());
entity.setFlavorName(dto.getFlavorName());
entity.setTag(dto.getTag());
entity.setProject(dto.getProject());
// Set calcOn - you may want to derive this from state or other logic
entity.setCalcOn(dto.isCalcOn());
@@ -166,7 +168,7 @@ public class MessageListener {
entity.setEmissionSource(dto.getEmissionSource());
// Debug logging
System.out.println("🔍 VM Entity Created: " + dto.getVmName() + " - state = " + dto.getState() + " - calcOn = " + dto.isCalcOn() + " - project = " + dto.getProject());
System.out.println("🔍 VM Entity Created: " + dto.getVmName() + " - state = " + dto.getState() + " - calcOn = " + dto.isCalcOn());
if (dto.getEmissionSource() != null && !dto.getEmissionSource().isEmpty()) {
System.out.println(" Emission Sources: " + dto.getEmissionSource());
}
@@ -182,7 +184,6 @@ public class MessageListener {
entity.setName(dto.getName());
entity.setIp(dto.getIp());
entity.setTag(dto.getTag());
entity.setCloudSystem(dto.getCloudSystem());
entity.setPower(dto.getPower());
// VMs are now processed separately from the new message format
@@ -206,44 +207,113 @@ public class MessageListener {
// ConsuptionUnit, and ActivitySubUnit are no longer received in the message
// These will need to be set via the DataCenter CRUD operations
// Convert Physical Machines directly
if (dto.getPhysicalMachine() != null) {
List<PhysicalMachine> physicalMachines = new ArrayList<>();
for (Map.Entry<String, PhysicalMachineDto> pmEntry : dto.getPhysicalMachine().entrySet()) {
String pmIp = pmEntry.getKey();
PhysicalMachineDto pmDto = pmEntry.getValue();
// Convert Projects
if (dto.getProjects() != null) {
List<Project> projects = new ArrayList<>();
for (Map.Entry<String, ProjectDto> projectEntry : dto.getProjects().entrySet()) {
String projectId = projectEntry.getKey();
ProjectDto projectDto = projectEntry.getValue();
PhysicalMachine pm = new PhysicalMachine();
pm.setName(pmDto.getName());
pm.setIp(pmIp); // Use the IP from the map key
pm.setTag(pmDto.getTag());
pm.setCloudSystem(pmDto.getCloudSystem());
pm.setPower(pmDto.getPower());
pm.setDataCenter(entity);
// Process VMs for this PM
if (pmDto.getVms() != null) {
List<VM> vms = new ArrayList<>();
for (Map.Entry<String, VMDto> vmEntry : pmDto.getVms().entrySet()) {
String vmIp = vmEntry.getKey();
VMDto vmDto = vmEntry.getValue();
VM vm = toVMEntity(vmDto);
vm.setIp(vmIp); // Use the IP from the map key
vm.setPhysicalMachine(pm);
vms.add(vm);
}
pm.setVms(vms);
// Set the project ID and a default name if not provided
projectDto.setId(projectId);
if (projectDto.getName() == null || projectDto.getName().isEmpty()) {
projectDto.setName("Project-" + projectId.substring(0, 8)); // Use first 8 chars of ID as name
}
physicalMachines.add(pm);
Project project = toProjectEntity(projectDto);
project.setDataCenter(entity);
projects.add(project);
}
entity.setProjects(projects);
}
return entity;
}
public Project toProjectEntity(ProjectDto dto){
if (dto == null)
return null;
Project entity = new Project();
entity.setName(dto.getName());
// Process MainOptimizationSpace instead of physical machines list
if (dto.getMainOptimizationSpace() != null) {
List<PhysicalMachine> physicalMachines = processMainOptimizationSpace(dto.getMainOptimizationSpace());
// Set project reference for each PM
physicalMachines.forEach(pm -> pm.setProject(entity));
entity.setPhysicalMachines(physicalMachines);
}
return entity;
}
/**
* Process MainOptimizationSpaceDto and assign VMs to their hosting PMs
*/
private List<PhysicalMachine> processMainOptimizationSpace(MainOptimizationSpaceDto mainOptSpace) {
List<PhysicalMachine> physicalMachines = new ArrayList<>();
if (mainOptSpace.getPms() == null || mainOptSpace.getVms() == null) {
System.out.println("⚠️ MainOptimizationSpace has null PMs or VMs");
return physicalMachines;
}
System.out.println("🔍 Processing MainOptimizationSpace with " +
mainOptSpace.getPms().size() + " PMs and " +
mainOptSpace.getVms().size() + " VMs");
// Convert PMs from DTO to Entity
for (Map.Entry<String, PhysicalMachineDto> pmEntry : mainOptSpace.getPms().entrySet()) {
String pmIp = pmEntry.getKey();
PhysicalMachineDto pmDto = pmEntry.getValue();
// Set the IP from the map key
pmDto.setIp(pmIp);
PhysicalMachine pm = toPhysicalMachineEntity(pmDto);
physicalMachines.add(pm);
System.out.println("✅ Created PM: " + pm.getName() + " (IP: " + pm.getIp() + ")");
}
// Assign VMs to their hosting PMs
for (Map.Entry<String, VMDto> vmEntry : mainOptSpace.getVms().entrySet()) {
String vmIp = vmEntry.getKey();
VMDto vmDto = vmEntry.getValue();
// Set the IP from the map key
vmDto.setIp(vmIp);
VM vm = toVMEntity(vmDto);
// Find the hosting PM by IP
String hostingPmIp = vmDto.getHostingPm();
PhysicalMachine hostingPm = physicalMachines.stream()
.filter(pm -> pm.getIp().equals(hostingPmIp))
.findFirst()
.orElse(null);
if (hostingPm != null) {
// Assign VM to PM
vm.setPhysicalMachine(hostingPm);
if (hostingPm.getVms() == null) {
hostingPm.setVms(new ArrayList<>());
}
hostingPm.getVms().add(vm);
System.out.println("✅ Assigned VM: " + vm.getVmName() + " (IP: " + vm.getIp() +
") to PM: " + hostingPm.getName() + " (IP: " + hostingPm.getIp() + ")");
} else {
System.err.println("❌ Could not find hosting PM with IP: " + hostingPmIp +
" for VM: " + vm.getVmName());
}
}
return physicalMachines;
}
@Transactional
public DataCenter createDataCenter(DataCenter newDc) {
try {
@@ -265,14 +335,31 @@ public class MessageListener {
// Note: DataCenter name and emission-related fields are no longer updated from the message
// These are now managed via DataCenter CRUD operations
// Ensure datacenter has initialized physical machines list
if (dc.getPhysicalMachines() == null) {
dc.setPhysicalMachines(new ArrayList<>());
for (Project newProject : newDc.getProjects()) {
Optional<Project> existingProjOpt = dc.getProjects().stream()
.filter(p -> p.getName().equalsIgnoreCase(newProject.getName()))
.findFirst();
Project project;
if (existingProjOpt.isPresent()) {
project = existingProjOpt.get();
project.setName(newProject.getName());
System.out.println("✅ Updated existing project: " + project.getName());
} else {
project = newProject;
project.setDataCenter(dc);
dc.getProjects().add(project);
System.out.println("✅ Created new project: " + project.getName());
}
// Process Physical Machines directly from the message structure
for (PhysicalMachine newPm : newDc.getPhysicalMachines()) {
Optional<PhysicalMachine> existingPmOpt = dc.getPhysicalMachines().stream()
// Ensure project has initialized physical machines list
if (project.getPhysicalMachines() == null) {
project.setPhysicalMachines(new ArrayList<>());
}
// Process Physical Machines (VMs are already assigned to PMs from MainOptimizationSpace)
for (PhysicalMachine newPm : newProject.getPhysicalMachines()) {
Optional<PhysicalMachine> existingPmOpt = project.getPhysicalMachines().stream()
.filter(pm -> pm.getIp().equals(newPm.getIp())) // Match by IP instead of name
.findFirst();
@@ -283,17 +370,16 @@ public class MessageListener {
pm.setName(newPm.getName());
pm.setIp(newPm.getIp());
pm.setTag(newPm.getTag());
pm.setCloudSystem(newPm.getCloudSystem());
pm.setPower(newPm.getPower());
System.out.println("✅ Updated existing PM: " + pm.getName() + " (IP: " + pm.getIp() + ") - CloudSystem: " + pm.getCloudSystem());
System.out.println("✅ Updated existing PM: " + pm.getName() + " (IP: " + pm.getIp() + ")");
} else {
// Create new PM
pm = newPm;
pm.setDataCenter(dc);
dc.getPhysicalMachines().add(pm);
pm.setProject(project);
project.getPhysicalMachines().add(pm);
System.out.println("✅ Created new PM: " + pm.getName() + " (IP: " + pm.getIp() + ") - CloudSystem: " + pm.getCloudSystem());
System.out.println("✅ Created new PM: " + pm.getName() + " (IP: " + pm.getIp() + ")");
}
// Process VMs that are already assigned to this PM
@@ -323,16 +409,6 @@ public class MessageListener {
if (existingVmOpt.isPresent()) {
// Update existing VM
vm = existingVmOpt.get();
// IMPORTANT: Remove VM from its current Physical Machine first
if (vm.getPhysicalMachine() != null) {
PhysicalMachine currentPM = vm.getPhysicalMachine();
if (currentPM.getVms() != null) {
currentPM.getVms().remove(vm);
System.out.println("🔄 Removed VM " + vm.getVmName() + " from previous PM: " + currentPM.getName());
}
}
vm.setState(newVm.getState());
vm.setVmName(newVm.getVmName());
vm.setIp(newVm.getIp());
@@ -343,7 +419,6 @@ public class MessageListener {
vm.setFlavorName(newVm.getFlavorName());
vm.setTag(newVm.getTag());
vm.setEmissionSource(newVm.getEmissionSource());
vm.setProject(newVm.getProject());
System.out.println("✅ Updated existing VM: " + vm.getVmName() + " (IP: " + vm.getIp() + ") - calcOn = " + vm.getCalcOn());
} else {
@@ -371,11 +446,12 @@ public class MessageListener {
}
}
}
}
System.out.println("Before Save: DataCenter=" + dc.getDataCenter());
System.out.println("External ID=" + dc.getExternalId());
System.out.println("Number=" + dc.getNumber());
System.out.println("Physical Machines=" + (dc.getPhysicalMachines() != null ? dc.getPhysicalMachines().size() : 0));
System.out.println("Projects=" + (dc.getProjects() != null ? dc.getProjects().size() : 0));
DataCenter saved = dataCenterService.save(dc);
System.out.println("✅ Saved: ID=" + saved.getId());
@@ -449,7 +525,8 @@ public class MessageListener {
int failedCalculations = 0;
int totalEmissionSources = 0;
for (PhysicalMachine pm : dataCenter.getPhysicalMachines()) {
for (Project project : dataCenter.getProjects()) {
for (PhysicalMachine pm : project.getPhysicalMachines()) {
if (pm.getVms() != null) {
// Calculate for all VMs (only those with calcOn = true)
for (VM vm : pm.getVms()) {
@@ -471,7 +548,7 @@ public class MessageListener {
Integer percentage = sourceEntry.getValue();
System.out.println(" - " + sourceName + ": " + percentage + "%");
boolean success = createVMEmissionRecordForSource(dataCenter, vm, pm, sourceName, percentage);
boolean success = createVMEmissionRecordForSource(dataCenter, vm, project, pm, sourceName, percentage);
if (success) {
successfulCalculations++;
} else {
@@ -482,7 +559,7 @@ public class MessageListener {
// Fallback to default emission source if VM has no emission sources
System.out.println("⚠️ VM has no emission sources, using default");
totalEmissionSources++;
boolean success = createVMEmissionRecord(dataCenter, vm, pm);
boolean success = createVMEmissionRecord(dataCenter, vm, project, pm);
if (success) {
successfulCalculations++;
} else {
@@ -498,6 +575,7 @@ public class MessageListener {
}
}
}
}
System.out.println("🎯 VM Emission Calculation Summary:");
System.out.println(" Total VMs found: " + totalVMs);
@@ -509,7 +587,7 @@ public class MessageListener {
System.out.println(" Failed emission calculations: " + failedCalculations);
}
private boolean createVMEmissionRecord(DataCenter dataCenter, VM vm, PhysicalMachine pm) {
private boolean createVMEmissionRecord(DataCenter dataCenter, VM vm, Project project, PhysicalMachine pm) {
try {
// Check if VM has an ID (is persisted)
if (vm.getId() == null) {
@@ -517,7 +595,7 @@ public class MessageListener {
return false;
}
MainDataTableCreateInput input = createVMMainDataTableInput(dataCenter, vm, pm);
MainDataTableCreateInput input = createVMMainDataTableInput(dataCenter, vm, project, pm);
System.out.println("🔍 Creating emission record for VM: " + vm.getVmName() + " (Power: " + vm.getPower() + "W)");
MainDataTable result = callMainDataTableMutation(input);
@@ -541,7 +619,7 @@ public class MessageListener {
}
}
private boolean createVMEmissionRecordForSource(DataCenter dataCenter, VM vm, PhysicalMachine pm, String emissionSourceName, Integer percentage) {
private boolean createVMEmissionRecordForSource(DataCenter dataCenter, VM vm, Project project, PhysicalMachine pm, String emissionSourceName, Integer percentage) {
try {
// Check if VM has an ID (is persisted)
if (vm.getId() == null) {
@@ -549,56 +627,19 @@ public class MessageListener {
return false;
}
// Find the emission source by name/tag from datacenter's configured emission sources
EmissionSource emissionSource = null;
// First, try to find the emission source from datacenter's configured sources
if (dataCenter.getDataCenterEmissionSources() != null && !dataCenter.getDataCenterEmissionSources().isEmpty()) {
for (DataCenterEmissionSource dces : dataCenter.getDataCenterEmissionSources()) {
if (dces.getEmissionSource() != null &&
emissionSourceName.equalsIgnoreCase(dces.getEmissionSource().getTag())) {
emissionSource = dces.getEmissionSource();
System.out.println("✅ Found emission source '" + emissionSourceName +
"' in datacenter's configured sources (ID: " + emissionSource.getId() + ")");
break;
}
}
}
// If not found in datacenter's sources, fall back to subsector-specific search
if (emissionSource == null && dataCenter.getSubSector() != null) {
emissionSource = emissionSourceRepo.findByTagAndSubSectorIgnoreCase(emissionSourceName, dataCenter.getSubSector());
if (emissionSource != null) {
System.out.println("⚠️ Using subsector fallback for emission source '" + emissionSourceName +
"' (ID: " + emissionSource.getId() + ") - Consider configuring it for datacenter");
}
}
// Last resort: global search
if (emissionSource == null) {
// Find the emission source by name/tag
List<EmissionSource> emissionSources = emissionSourceRepo.findByTag(emissionSourceName);
if (!emissionSources.isEmpty()) {
emissionSource = emissionSources.get(0);
System.out.println("⚠️ Using global fallback for emission source '" + emissionSourceName +
"' (ID: " + emissionSource.getId() + ") - This may cause incorrect calculations!");
}
}
if (emissionSource == null) {
if (emissionSources.isEmpty()) {
System.err.println("❌ Could not find emission source: " + emissionSourceName);
return false;
}
EmissionSource emissionSource = emissionSources.get(0);
// Calculate power consumption for this emission source (percentage of total VM power)
double sourceSpecificPower = vm.getPower() * (percentage / 100.0);
MainDataTableCreateInput input = createVMMainDataTableInputForSource(dataCenter, vm, pm, emissionSource, sourceSpecificPower, percentage);
if (input == null) {
System.err.println("❌ Failed to create input for VM emission calculation - skipping");
return false;
}
MainDataTableCreateInput input = createVMMainDataTableInputForSource(dataCenter, vm, project, pm, emissionSource, sourceSpecificPower, percentage);
System.out.println("🔍 Creating emission record for VM: " + vm.getVmName() +
" - Source: " + emissionSourceName + " (" + percentage + "%) - Power: " + sourceSpecificPower + "W");
@@ -624,7 +665,7 @@ public class MessageListener {
}
}
private MainDataTableCreateInput createVMMainDataTableInput(DataCenter dataCenter, VM vm, PhysicalMachine pm) {
private MainDataTableCreateInput createVMMainDataTableInput(DataCenter dataCenter, VM vm, Project project, PhysicalMachine pm) {
MainDataTableCreateInput input = new MainDataTableCreateInput();
// Copy datacenter-level information (if available)
@@ -651,15 +692,8 @@ public class MessageListener {
input.setSubSector(dataCenter.getSubSector().getId());
}
// Handle multiple emission sources - use the default one for emission calculations
if (dataCenter.getDataCenterEmissionSources() != null && !dataCenter.getDataCenterEmissionSources().isEmpty()) {
// Find the default emission source or use the first one
DataCenterEmissionSource defaultEmissionSource = dataCenter.getDataCenterEmissionSources().stream()
.filter(DataCenterEmissionSource::getIsDefault)
.findFirst()
.orElse(dataCenter.getDataCenterEmissionSources().get(0));
input.setEmissionSource(defaultEmissionSource.getEmissionSource().getId());
if (dataCenter.getEmissionSource() != null) {
input.setEmissionSource(dataCenter.getEmissionSource().getId());
} else {
// Fallback to default emission source for electricity
try {
@@ -677,16 +711,8 @@ public class MessageListener {
input.setActivitySubUnit(dataCenter.getActivitySubUnit().getId());
}
// Handle consumption unit from emission sources - use the default one for VM calculations
if (dataCenter.getDataCenterEmissionSources() != null && !dataCenter.getDataCenterEmissionSources().isEmpty()) {
DataCenterEmissionSource defaultEmissionSource = dataCenter.getDataCenterEmissionSources().stream()
.filter(DataCenterEmissionSource::getIsDefault)
.findFirst()
.orElse(dataCenter.getDataCenterEmissionSources().get(0));
if (defaultEmissionSource.getConsuptionUnit() != null) {
input.setConsuptionUnit(defaultEmissionSource.getConsuptionUnit().getId());
}
if (dataCenter.getConsuptionUnit() != null) {
input.setConsuptionUnit(dataCenter.getConsuptionUnit().getId());
}
// Default to Kapsam-3 if no emission scope is set
@@ -713,142 +739,68 @@ public class MessageListener {
System.out.println(" VM Name: " + vm.getVmName());
System.out.println(" Power: " + vm.getPower() + "W");
System.out.println(" Physical Machine: " + pm.getName());
System.out.println(" Project: " + project.getName());
System.out.println(" DataCenter Sector: " + (dataCenter.getSector() != null ? dataCenter.getSector().getTag() : "NOT SET"));
return input;
}
private MainDataTableCreateInput createVMMainDataTableInputForSource(DataCenter dataCenter, VM vm, PhysicalMachine pm, EmissionSource emissionSource, double sourceSpecificPower, Integer percentage) {
private MainDataTableCreateInput createVMMainDataTableInputForSource(DataCenter dataCenter, VM vm, Project project, PhysicalMachine pm, EmissionSource emissionSource, double sourceSpecificPower, Integer percentage) {
MainDataTableCreateInput input = new MainDataTableCreateInput();
// Copy datacenter-level information (if available)
input.setYear("2025");
input.setMonth("07");
// Validate required fields
if (dataCenter == null) {
System.err.println("❌ DataCenter is null - cannot create emission record");
return null;
}
if (vm == null) {
System.err.println("❌ VM is null - cannot create emission record");
return null;
}
if (emissionSource == null) {
System.err.println("❌ EmissionSource is null - cannot create emission record");
return null;
}
// Note: These fields are no longer received in the message
// They need to be set via DataCenter CRUD operations first
if (dataCenter.getArea() != null && !dataCenter.getArea().getCities().isEmpty()) {
input.setCity(dataCenter.getArea().getCities().get(0).getId());
System.out.println("🔍 Setting City: " + dataCenter.getArea().getCities().get(0).getId());
} else {
System.out.println("⚠️ Warning: No city available for DataCenter");
}
if (dataCenter.getArea() != null && !dataCenter.getArea().getDistricts().isEmpty()) {
input.setDistrict(dataCenter.getArea().getDistricts().get(0).getId());
System.out.println("🔍 Setting District: " + dataCenter.getArea().getDistricts().get(0).getId());
} else {
System.out.println("⚠️ Warning: No district available for DataCenter");
}
if (dataCenter.getSector() != null) {
input.setSector(dataCenter.getSector().getId());
System.out.println("🔍 Setting Sector: " + dataCenter.getSector().getId() + " (" + dataCenter.getSector().getTag() + ")");
} else {
System.err.println("❌ Error: DataCenter has no sector set - this is required for emission calculation");
return null;
System.out.println("⚠️ Warning: DataCenter has no sector set - emission calculation may fail");
}
if (dataCenter.getSubSector() != null) {
input.setSubSector(dataCenter.getSubSector().getId());
System.out.println("🔍 Setting SubSector: " + dataCenter.getSubSector().getId());
} else {
System.out.println("⚠️ Warning: DataCenter has no subsector set");
}
// Use the specific emission source for this calculation
input.setEmissionSource(emissionSource.getId());
System.out.println("🔍 Setting EmissionSource: " + emissionSource.getId() + " (" + emissionSource.getTag() + ")");
if (dataCenter.getActivitySubUnit() != null) {
input.setActivitySubUnit(dataCenter.getActivitySubUnit().getId());
System.out.println("🔍 Setting ActivitySubUnit: " + dataCenter.getActivitySubUnit().getId());
} else {
System.out.println("⚠️ Warning: DataCenter has no activity sub unit set");
}
// Handle consumption unit from emission sources - use the emission source's unit
if (emissionSource != null) {
// Find the DataCenterEmissionSource that matches this emissionSource
System.out.println("🔍 Looking for consumption unit for emission source: " + emissionSource.getTag());
if (dataCenter.getDataCenterEmissionSources() == null || dataCenter.getDataCenterEmissionSources().isEmpty()) {
System.err.println("❌ Error: DataCenter has no emission sources configured - cannot find consumption unit");
return null;
}
boolean foundUnit = false;
for (DataCenterEmissionSource dces : dataCenter.getDataCenterEmissionSources()) {
if (dces.getEmissionSource() != null && dces.getEmissionSource().getId().equals(emissionSource.getId())) {
if (dces.getConsuptionUnit() != null) {
input.setConsuptionUnit(dces.getConsuptionUnit().getId());
System.out.println("🔍 Setting ConsumptionUnit: " + dces.getConsuptionUnit().getId() + " (" + dces.getConsuptionUnit().getTag() + ")");
foundUnit = true;
break;
} else {
System.err.println("❌ Error: DataCenterEmissionSource has no consumption unit set for emission source: " + emissionSource.getTag());
return null;
}
}
}
if (!foundUnit) {
System.err.println("❌ Error: Could not find matching DataCenterEmissionSource for emission source: " + emissionSource.getTag());
return null;
}
if (dataCenter.getConsuptionUnit() != null) {
input.setConsuptionUnit(dataCenter.getConsuptionUnit().getId());
}
// Default to Kapsam-3 if no emission scope is set
input.setScope(dataCenter.getEmissionScope() != null ?
dataCenter.getEmissionScope().getTag().equals("Kapsam-3") : true);
System.out.println("🔍 Setting Scope: " + (dataCenter.getEmissionScope() != null ?
dataCenter.getEmissionScope().getTag() : "Kapsam-3 (default)"));
try {
List<Organization> organizations = organizationRepo.findAll();
if (!organizations.isEmpty()) {
input.setOrganization(organizations.get(0).getId());
System.out.println("🔍 Setting Organization: " + organizations.get(0).getId());
} else {
System.err.println("❌ Error: No organizations found in database - this is required");
return null;
}
} catch (Exception e) {
System.err.println("❌ Error finding organization: " + e.getMessage());
return null;
}
// Set VM-specific fields
input.setVmId(vm.getId());
System.out.println("🔍 Setting VM ID: " + vm.getId());
// Use the source-specific power consumption (percentage of total VM power)
// Format to 6 decimal places to avoid very long strings
String formattedPower = String.format("%.6f", sourceSpecificPower);
input.setConsuptionAmount(formattedPower);
System.out.println("🔍 Setting Consumption Amount: " + formattedPower + "W");
// Validate field lengths to prevent database errors
System.out.println("🔍 Field length validation:");
System.out.println(" Year: " + (input.getYear() != null ? input.getYear().length() : "null"));
System.out.println(" Month: " + (input.getMonth() != null ? input.getMonth().length() : "null"));
System.out.println(" ConsuptionAmount: " + (input.getConsuptionAmount() != null ? input.getConsuptionAmount().length() : "null"));
input.setConsuptionAmount(String.valueOf(sourceSpecificPower));
System.out.println("🔍 VM Emission Input for Source:");
System.out.println(" VM ID: " + vm.getId());
@@ -857,6 +809,7 @@ public class MessageListener {
System.out.println(" Percentage: " + percentage + "%");
System.out.println(" Source Power: " + sourceSpecificPower + "W");
System.out.println(" Physical Machine: " + pm.getName());
System.out.println(" Project: " + project.getName());
System.out.println(" DataCenter Sector: " + (dataCenter.getSector() != null ? dataCenter.getSector().getTag() : "NOT SET"));
return input;
@@ -875,34 +828,6 @@ public class MessageListener {
try {
System.out.println("🔄 Calling mainDataTableMutation.createMainDataTable...");
// Validate input fields before making the call
if (input.getSector() == null) {
System.err.println("❌ Sector is null - cannot create emission record");
return null;
}
if (input.getEmissionSource() == null) {
System.err.println("❌ EmissionSource is null - cannot create emission record");
return null;
}
if (input.getConsuptionUnit() == null) {
System.err.println("❌ ConsumptionUnit is null - cannot create emission record");
return null;
}
if (input.getOrganization() == null) {
System.err.println("❌ Organization is null - cannot create emission record");
return null;
}
if (input.getVmId() == null) {
System.err.println("❌ VM ID is null - cannot create emission record");
return null;
}
System.out.println("🔍 Input validation passed - proceeding with mutation call");
// Call the mutation method - pass null environment since we've already patched the logging
MainDataTable result = mainDataTableMutation.createMainDataTable(input, null);

15
sge-backend/src/main/resources/application.properties
View File

@@ -17,16 +17,10 @@ security.jwt.token.secret-key=secret
app.survey.base-url=http://localhost.com
# spring.rabbitmq.host=188.132.198.145
# spring.rabbitmq.port=5672
# spring.rabbitmq.username=testuser
# spring.rabbitmq.password=JGasF24561AZv2894De
#spring.rabbitmq.host=rabbitmq
spring.rabbitmq.host=localhost
spring.rabbitmq.host=188.132.198.145
spring.rabbitmq.port=5672
spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
spring.rabbitmq.username=testuser
spring.rabbitmq.password=JGasF24561AZv2894De
spring.rabbitmq.virtual-host=/
spring.rabbitmq.connection-timeout=20000
spring.rabbitmq.template.retry.enabled=true
@@ -34,3 +28,6 @@ spring.rabbitmq.template.retry.max-attempts=3
spring.rabbitmq.template.retry.initial-interval=1000ms
logging.level.org.springframework.amqp=DEBUG
spring.jpa.show-sql=true
logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE

21
sge-backend/src/main/resources/graphql/dataCenter/input.graphqls
View File

@@ -5,13 +5,10 @@ input DataCenterCreateInput {
sectorId: ID
subSectorId: ID
activitySubUnitId: ID
# Multiple emission sources support - each with exactly one unit
dataCenterEmissionSources: [DataCenterEmissionSourceInput!]
emissionSourceId: ID
consuptionUnitId: ID
consuptionAmount: Float
areaId: ID
cityId: ID
number: Int
ayposURL: String
address: String
@@ -26,23 +23,13 @@ input DataCenterUpdateInput {
sectorId: ID
subSectorId: ID
activitySubUnitId: ID
# Multiple emission sources support - each with exactly one unit
dataCenterEmissionSources: [DataCenterEmissionSourceInput!]
emissionSourceId: ID
consuptionUnitId: ID
consuptionAmount: Float
areaId: ID
cityId: ID
number: Int
ayposURL: String
address: String
latitude: Float
longitude: Float
}
input DataCenterEmissionSourceInput {
emissionSourceId: ID!
consuptionUnitId: ID!
isDefault: Boolean
percentage: Float
}

1
sge-backend/src/main/resources/graphql/dataCenter/query.graphqls
View File

@@ -3,5 +3,4 @@ extend type Query{
dataCenters(criteria: DataCenterCriteria, sortBy: [SortBy!]): [DataCenter!]
paginateDataCenters(pagination : Pagination!, criteria: DataCenterCriteria, sortBy:[SortBy!] ) : DataCenterPageable!
getByNumber(number: Int!): DataCenter
physicalMachines(datacenterId: ID!): [PhysicalMachine!]!
}

25
sge-backend/src/main/resources/graphql/dataCenter/type.graphqls
View File

@@ -7,15 +7,12 @@ type DataCenter {
sector: Sector
subSector: SubSector
activitySubUnit: ActivitySubUnit
# Multiple emission sources support - each with exactly one unit
dataCenterEmissionSources: [DataCenterEmissionSource]
emissionSource: EmissionSource
consuptionUnit: ConsuptionUnit
consuptionAmount: Float
physicalMachines: [PhysicalMachine]
projects: [Project]
area: Area
city: City
number: Int
ayposURL: String
@@ -24,12 +21,10 @@ type DataCenter {
longitude: Float
}
type DataCenterEmissionSource {
type Project {
id: ID
emissionSource: EmissionSource
consuptionUnit: ConsuptionUnit
isDefault: Boolean
percentage: Float
name: String
physicalMachines: [PhysicalMachine]
}
type PhysicalMachine {
@@ -37,13 +32,11 @@ type PhysicalMachine {
name: String
ip: String
tag: String
cloudSystem: String
power: Float
vms: [VM]
dataCenter: DataCenter
vms: [Vm]
}
type VM {
type Vm {
id: ID
state: String
vmName: String
@@ -54,10 +47,8 @@ type VM {
host: String
flavorName: String
tag: String
project: String
emissionSource: EmissionSourceMap
config: Config
physicalMachine: PhysicalMachine
}
scalar EmissionSourceMap

2
sge-backend/src/main/resources/graphql/mainDataTable/query.graphqls
View File

@@ -2,5 +2,5 @@ extend type Query{
mainDataTable(id: ID!): MainDataTable!
mainDataTables(criteria: MainDataTableCriteria, sortBy: [SortBy!]): [MainDataTable!]
paginateMainDataTables(pagination : Pagination!, criteria: MainDataTableCriteria, sortBy:[SortBy!] ) : MainDataTablePageable!
vmEmissionSummary(datacenterId: ID): [VMEmissionSummary!]!
vmEmissionSummary: [VMEmissionSummary!]!
}

13
sge-backend/src/main/resources/graphql/mainDataTable/type.graphqls
View File

@@ -26,11 +26,11 @@ type MainDataTable {
proteinAmount:Float
burnOrOpenBurn:Boolean
scopeCheck:Boolean
vm: VM
vm: Vm
}
type VM {
type Vm {
id: ID
state: String
vmName: String
@@ -41,7 +41,6 @@ type VM {
host: String
flavorName: String
tag: String
project: String
config: Config
}
@@ -52,22 +51,22 @@ type Config {
disk: Int
}
type VMEmissionSummary {
type VMEmissionSummary {
vmId: ID!
vmName: String
vmName: String!
vmPower: Float
vmStatus: String
totalEmission: Float!
createdDate: LocalDateTime!
physicalMachine: String
cloudSystem: String
project: String
dataCenter: String
# Individual emission values per record
co2: Float!
ch4: Float!
n2o: Float!
reportGeneratedTime: LocalDateTime
}
}
type SolidWasteSupplement {
id: ID!

6
sge-frontend/src/locales/en/translation.json
View File

@@ -67,7 +67,11 @@
"Common": {
"save": "Save",
"cancel": "Cancel"
"cancel": "Cancel",
"yes": "Yes",
"no": "No",
"areYouSure": "Are you sure?",
"cantRevert": "This action cannot be undone!"
},
"DataInput": {

6
sge-frontend/src/locales/tr/translation.json
View File

@@ -66,7 +66,11 @@
"Common": {
"save": "Kaydet",
"cancel": " İptal"
"cancel": "İptal",
"yes": "Evet",
"no": "Hayır",
"areYouSure": "Emin misiniz?",
"cantRevert": "Bu işlem geri alınamaz!"
},
"DataInput": {

62
sge-frontend/src/navigation/horizontal/index.js
View File

@@ -49,9 +49,9 @@ export default [
permissionCheck("paginate_roles_get")) && [
{
id: "Organizations",
title: "DataCenters.title",
title: "Data Center Management",
icon: <Home size={20} />,
navLink: "/organizasyonlar",
navLink: "/veri-merkezi-yonetimi",
display: (permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
permissionCheck("data_center_update") ||
@@ -142,9 +142,63 @@ export default [
},
{
id: "DataCenter",
title: "Data Centers",
title: "Data Center Overview",
icon: <Zap size={20} />,
navLink: "/verimerkezi",
navLink: "/veri-merkezi-genel",
},
{
id: "Areas",
title: "Areas.areas",
icon: <Map size={20} />,
display:
permissionCheck("paginate_areas_get") ||
permissionCheck("paginate_countries_get") ||
permissionCheck("paginate_cities_get") ||
permissionCheck("paginate_districts_get") ||
permissionCheck("paginate_neighborhoods_get")
? ""
: "none",
children: (permissionCheck("paginate_areas_get") ||
permissionCheck("paginate_countries_get") ||
permissionCheck("paginate_cities_get") ||
permissionCheck("paginate_districts_get") ||
permissionCheck("paginate_neighborhoods_get")) && [
{
id: "AreasManagement",
title: "Areas.areas",
icon: <ArrowRight size={20} />,
navLink: "/alanlar",
display: permissionCheck("paginate_areas_get") ? "" : "none",
},
{
id: "Countries",
title: "Areas.countries",
icon: <ArrowRight size={20} />,
navLink: "/ulkeler",
display: permissionCheck("paginate_countries_get") ? "" : "none",
},
{
id: "Cities",
title: "Areas.cities",
icon: <ArrowRight size={20} />,
navLink: "/iller",
display: permissionCheck("paginate_cities_get") ? "" : "none",
},
{
id: "Districts",
title: "Areas.districts",
icon: <ArrowRight size={20} />,
navLink: "/ilceler",
display: permissionCheck("paginate_districts_get") ? "" : "none",
},
{
id: "Neighborhoods",
title: "Areas.neighborhoods",
icon: <ArrowRight size={20} />,
navLink: "/mahalleler",
display: permissionCheck("paginate_neighborhoods_get") ? "" : "none",
},
],
},
{
id: "Survey",

62
sge-frontend/src/navigation/vertical/index.js
View File

@@ -49,9 +49,9 @@ export default [
permissionCheck("paginate_roles_get")) && [
{
id: "DataCenters",
title: "DataCenters.title",
title: "Data Center Management",
icon: <Zap size={20} />,
navLink: "/organizasyonlar",
navLink: "/veri-merkezi-yonetimi",
display: (permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
permissionCheck("data_center_update") ||
@@ -142,9 +142,63 @@ export default [
},
{
id: "DataCenter",
title: "DataCenters",
title: "Data Center Overview",
icon: <Zap size={20} />,
navLink: "/verimerkezi",
navLink: "/veri-merkezi-genel",
},
{
id: "Areas",
title: "Areas.areas",
icon: <Map size={20} />,
display:
permissionCheck("paginate_areas_get") ||
permissionCheck("paginate_countries_get") ||
permissionCheck("paginate_cities_get") ||
permissionCheck("paginate_districts_get") ||
permissionCheck("paginate_neighborhoods_get")
? ""
: "none",
children: (permissionCheck("paginate_areas_get") ||
permissionCheck("paginate_countries_get") ||
permissionCheck("paginate_cities_get") ||
permissionCheck("paginate_districts_get") ||
permissionCheck("paginate_neighborhoods_get")) && [
{
id: "AreasManagement",
title: "Areas.areas",
icon: <ArrowRight size={20} />,
navLink: "/alanlar",
display: permissionCheck("paginate_areas_get") ? "" : "none",
},
{
id: "Countries",
title: "Areas.countries",
icon: <ArrowRight size={20} />,
navLink: "/ulkeler",
display: permissionCheck("paginate_countries_get") ? "" : "none",
},
{
id: "Cities",
title: "Areas.cities",
icon: <ArrowRight size={20} />,
navLink: "/iller",
display: permissionCheck("paginate_cities_get") ? "" : "none",
},
{
id: "Districts",
title: "Areas.districts",
icon: <ArrowRight size={20} />,
navLink: "/ilceler",
display: permissionCheck("paginate_districts_get") ? "" : "none",
},
{
id: "Neighborhoods",
title: "Areas.neighborhoods",
icon: <ArrowRight size={20} />,
navLink: "/mahalleler",
display: permissionCheck("paginate_neighborhoods_get") ? "" : "none",
},
],
},
{
id: "Survey",

9
sge-frontend/src/redux/actions/areas/index.js
View File

@@ -12,6 +12,15 @@ export const getAreas = () => {
id
tag
isDeleted
cities {
id
name
coordinates
country {
id
name
}
}
}
}
`,

184
sge-frontend/src/redux/actions/dataCenter/index.js
View File

@@ -34,10 +34,41 @@ export const getDataCenters = () => {
latitude
longitude
area {
id
tag
cities {
id
name
cityId
districtId
}
districts {
id
name
}
}
emissionScope {
id
tag
description
}
sector {
id
tag
}
subSector {
id
tag
}
emissionSource {
id
tag
}
consuptionUnit {
id
description
}
activitySubUnit {
id
tag
}
projects {
id
@@ -46,11 +77,15 @@ export const getDataCenters = () => {
id
name
vms {
active {
id
status
name
vmName
state
power
calcOn
hostingPm
host
flavorName
tag
config {
id
cpu
@@ -62,7 +97,6 @@ export const getDataCenters = () => {
}
}
}
}
`,
},
{
@@ -155,10 +189,41 @@ export const createDataCenter = (dataCenterData) => {
latitude
longitude
area {
id
tag
cities {
id
name
cityId
districtId
}
districts {
id
name
}
}
emissionScope {
id
tag
description
}
sector {
id
tag
}
subSector {
id
tag
}
emissionSource {
id
tag
}
consuptionUnit {
id
description
}
activitySubUnit {
id
tag
}
}
}
@@ -169,11 +234,16 @@ export const createDataCenter = (dataCenterData) => {
externalId: parseInt(dataCenterData.externalId),
ayposURL: dataCenterData.ayposURL || "",
number: parseInt(dataCenterData.number) || 1,
areaId: dataCenterData.areaId,
areaId: dataCenterData.areaId || null,
address: dataCenterData.address || "",
latitude: dataCenterData.latitude ? parseFloat(dataCenterData.latitude) : null,
longitude: dataCenterData.longitude ? parseFloat(dataCenterData.longitude) : null,
city: dataCenterData.city
emissionScopeId: dataCenterData.emissionScopeId || null,
sectorId: dataCenterData.sectorId || null,
subSectorId: dataCenterData.subSectorId || null,
emissionSourceId: dataCenterData.emissionSourceId || null,
consuptionUnitId: dataCenterData.consuptionUnitId || null,
activitySubUnitId: dataCenterData.activitySubUnitId || null
}
}
},
@@ -240,10 +310,41 @@ export const updateDataCenter = (id, dataCenterData) => {
latitude
longitude
area {
id
tag
cities {
id
name
cityId
districtId
}
districts {
id
name
}
}
emissionScope {
id
tag
description
}
sector {
id
tag
}
subSector {
id
tag
}
emissionSource {
id
tag
}
consuptionUnit {
id
description
}
activitySubUnit {
id
tag
}
}
}
@@ -255,11 +356,16 @@ export const updateDataCenter = (id, dataCenterData) => {
externalId: parseInt(dataCenterData.externalId),
ayposURL: dataCenterData.ayposURL || "",
number: parseInt(dataCenterData.number) || 1,
areaId: dataCenterData.areaId,
areaId: dataCenterData.areaId || null,
address: dataCenterData.address || "",
latitude: dataCenterData.latitude ? parseFloat(dataCenterData.latitude) : null,
longitude: dataCenterData.longitude ? parseFloat(dataCenterData.longitude) : null,
city: dataCenterData.city
emissionScopeId: dataCenterData.emissionScopeId || null,
sectorId: dataCenterData.sectorId || null,
subSectorId: dataCenterData.subSectorId || null,
emissionSourceId: dataCenterData.emissionSourceId || null,
consuptionUnitId: dataCenterData.consuptionUnitId || null,
activitySubUnitId: dataCenterData.activitySubUnitId || null
}
}
},
@@ -342,6 +448,56 @@ export const deleteDataCenter = (id) => {
};
};
export const getEmissionScopes = () => {
return async (dispatch) => {
dispatch({
type: "GET_EMISSION_SCOPES_LOADING",
});
try {
const response = await ApplicationService.http().post(
"/graphql",
{
query: `
query GetEmissionScopes {
emissionScopes {
id
tag
description
}
}
`
},
{
headers: {
Authorization: "Bearer " + localStorage.getItem("accessToken"),
},
}
);
if (response.data?.errors) {
throw new Error(response.data.errors[0].message);
}
dispatch({
type: "GET_EMISSION_SCOPES_SUCCESS",
payload: response.data.data.emissionScopes
});
return response.data.data.emissionScopes;
} catch (error) {
console.error("Error fetching emission scopes:", error);
dispatch({
type: "GET_EMISSION_SCOPES_ERROR",
payload: {
error: error.message || "Failed to fetch emission scopes",
},
});
throw error;
}
};
};
export const getDataCenterVMs = (dataCenterId) => {
return new Promise(async (resolve, reject) => {
// Don't make the request if dataCenterId is undefined, null, or empty

32
sge-frontend/src/redux/actions/mainDataTables/index.js
View File

@@ -125,11 +125,12 @@ export const getMainDataTablesWithPaginate = (data) => {
{
paginateMainDataTables(
pagination: { page: 0, rowsPerPage: 100 }
criteria: { deleted: false }
criteria: { deleted: false, hasVm: true }
sortBy: [{ field: "createdDate", direction: DESC }]
) {
content {
id
year
sector {
id
tag
@@ -138,11 +139,40 @@ export const getMainDataTablesWithPaginate = (data) => {
id
tag
}
activitySubUnit {
id
tag
}
emissionSource {
id
tag
}
emissionScope {
id
tag
}
co2
ch4
n2o
totalEmission
createdDate
vm {
id
vmName
state
power
calcOn
hostingPm
host
flavorName
tag
config {
id
cpu
ram
disk
}
}
}
pageInfo {
totalElements

33
sge-frontend/src/redux/reducers/emissionScope/index.js Normal file
View File

@@ -0,0 +1,33 @@
const initialState = {
emissionScopes: [],
loading: false,
error: null,
};
const emissionScopeReducer = (state = initialState, action) => {
switch (action.type) {
case "GET_EMISSION_SCOPES_LOADING":
return {
...state,
loading: true,
error: null,
};
case "GET_EMISSION_SCOPES_SUCCESS":
return {
...state,
loading: false,
emissionScopes: action.payload,
error: null,
};
case "GET_EMISSION_SCOPES_ERROR":
return {
...state,
loading: false,
error: action.payload.error,
};
default:
return state;
}
};
export default emissionScopeReducer;

2
sge-frontend/src/redux/reducers/rootReducer.js
View File

@@ -27,6 +27,7 @@ import surveys from "./surveys";
import uploads from "./upload";
import mailSettings from "./mailSettings";
import dataCenter from "./dataCenter";
import emissionScope from "./emissionScope";
const rootReducer = combineReducers({
accessToken,
@@ -57,6 +58,7 @@ const rootReducer = combineReducers({
uploads,
mailSettings,
dataCenter,
emissionScope,
});
export default rootReducer;

4
sge-frontend/src/router/routes/index.js
View File

@@ -25,7 +25,7 @@ const Routes = [
display: permissionCheck("paginate_users_get"),
},
{
path: "/organizasyonlar",
path: "/veri-merkezi-yonetimi",
component: lazy(() => import("../../views/DataCenterManagement")),
display: permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
@@ -74,7 +74,7 @@ const Routes = [
display: permissionCheck("activity_sub_units_get"),
},
{
path: "/verimerkezi",
path: "/veri-merkezi-genel",
component: lazy(() => import("../../views/DataCenter")),
},
{

180
sge-frontend/src/views/DataCenter.js
View File

@@ -41,14 +41,23 @@ const DataCenter = () => {
// Projects
{
name: "Projects",
selector: (row) =>
(row.projects || []).map((p) => p.name).join(", "),
sortable: false,
selector: (row) => (row.projects || []).length,
sortable: true,
minWidth: "200px",
cell: (row) => (
<span>
{(row.projects || []).map((p) => p.name).join(", ") || "-"}
</span>
<div>
{(row.projects || []).length > 0 ? (
<div className="d-flex flex-column">
{row.projects.map((project, index) => (
<div key={project.id} className={`badge badge-light-primary ${index > 0 ? 'mt-1' : ''}`}>
{project.name}
</div>
))}
</div>
) : (
<span className="text-muted">-</span>
)}
</div>
),
},
// Physical Machines
@@ -68,26 +77,41 @@ const DataCenter = () => {
},
},
{
name: "Total Active VMs",
name: "Virtual Machines",
selector: (row) => {
const pms = getAllPhysicalMachines(row);
return pms.reduce(
(total, pm) => total + (pm.vms?.active?.length || 0),
0
);
const vms = pms.reduce((acc, pm) => {
if (!pm.vms) return acc;
return {
active: acc.active + pm.vms.filter(vm => vm.state?.toLowerCase() === "active").length,
total: acc.total + pm.vms.length
};
}, { active: 0, total: 0 });
return vms.total;
},
sortable: true,
minWidth: "150px",
minWidth: "200px",
cell: (row) => {
const pms = getAllPhysicalMachines(row);
const totalVMs = pms.reduce(
(total, pm) => total + (pm.vms?.active?.length || 0),
0
);
const vms = pms.reduce((acc, pm) => {
if (!pm.vms) return acc;
return {
active: acc.active + pm.vms.filter(vm => vm.state?.toLowerCase() === "active").length,
total: acc.total + pm.vms.length
};
}, { active: 0, total: 0 });
return (
<div className="d-flex align-items-center">
<Monitor size={16} className="mr-1" />
<span>{totalVMs}</span>
<Monitor size={16} className="mr-2" />
<div>
<div className="font-weight-bold">{vms.total} Total</div>
<div className="small">
<span className="text-success">{vms.active} Active</span>
<span className="text-muted mx-1">•</span>
<span className="text-warning">{vms.total - vms.active} Inactive</span>
</div>
</div>
</div>
);
},
@@ -138,76 +162,78 @@ const DataCenter = () => {
<div key={pm.id} className="mb-3 border rounded p-3">
<h6 className="text-primary">{pm.name}</h6>
{/* Active VMs */}
<p className="mb-2">
<strong>Active VMs ({pm.vms?.active?.length || 0}):</strong>
</p>
{pm.vms?.active?.length > 0 ? (
<div className="ml-3">
{pm.vms.active.map((vm) => (
<div
key={vm.id}
className="mb-2 p-2 border-left border-success"
>
<div className="row">
<div className="col-md-3">
<strong>Name:</strong> {vm.name}
{/* All VMs */}
<div className="mb-2 d-flex justify-content-between align-items-center">
<h6 className="mb-0">
<Monitor size={16} className="mr-1" />
Virtual Machines ({pm.vms?.length || 0})
</h6>
</div>
<div className="col-md-2">
<strong>Status:</strong>
<span className="badge badge-success ml-1">
{vm.status}
</span>
</div>
<div className="col-md-2">
<strong>Power:</strong> {vm.power}
</div>
<div className="col-md-5">
<strong>Config:</strong> CPU: {vm.config?.cpu}, RAM:{" "}
{vm.config?.ram}, Disk: {vm.config?.disk}
</div>
</div>
</div>
))}
{pm.vms?.length > 0 ? (
<div className="table-responsive mt-2">
<table className="table table-bordered table-hover">
<thead className="thead-light">
<tr>
<th>Name</th>
<th>Status</th>
<th>Power (W)</th>
<th>Configuration</th>
<th>Host</th>
</tr>
</thead>
<tbody>
{pm.vms.map((vm) => {
const isActive = vm.state && ["ACTIVE", "active"].includes(vm.state);
return (
<tr key={vm.id}>
<td>
<span className="font-weight-bold">{vm.vmName || vm.vm_name}</span>
</td>
<td>
<div className={`d-inline-block px-2 py-1 rounded-pill ${isActive ? 'bg-light-success text-success' : 'bg-light-warning text-warning'}`}>
{vm.state}
</div>
</td>
<td>
{vm.power ? (
<span>{vm.power.toFixed(2)}</span>
) : (
<p className="text-muted ml-3">No active VMs</p>
<span className="text-muted">-</span>
)}
{/* Inactive VMs */}
<p className="mb-2 mt-3">
<strong>Inactive VMs ({pm.vms?.inactive?.length || 0}):</strong>
</p>
{pm.vms?.inactive?.length > 0 ? (
<div className="ml-3">
{pm.vms.inactive.map((vm) => (
<div
key={vm.id}
className="mb-2 p-2 border-left border-warning"
>
<div className="row">
<div className="col-md-3">
<strong>Name:</strong> {vm.name}
</td>
<td>
<div className="d-flex align-items-center">
<div className="mr-3">
<small className="text-muted d-block">CPU</small>
<span>{(vm.config?.cpu || (vm.confg && vm.confg[1])) || '-'}</span>
</div>
<div className="col-md-2">
<strong>Status:</strong>
<span className="badge badge-warning ml-1">
{vm.status}
</span>
<div className="mr-3">
<small className="text-muted d-block">RAM</small>
<span>{(vm.config?.ram || (vm.confg && vm.confg[2])) || '-'} GB</span>
</div>
<div className="col-md-2">
<strong>Power:</strong> {vm.power}
</div>
<div className="col-md-5">
<strong>Config:</strong> CPU: {vm.config?.cpu}, RAM:{" "}
{vm.config?.ram}, Disk: {vm.config?.disk}
<div>
<small className="text-muted d-block">Disk</small>
<span>{(vm.config?.disk || (vm.confg && vm.confg[3])) || '-'} GB</span>
</div>
</div>
</td>
<td>
<div className="d-flex align-items-center">
<Server size={14} className="mr-1" />
<span>{vm.host || vm.hostingPm || (vm.confg && vm.confg[4]) || '-'}</span>
</div>
))}
</td>
</tr>
);
})}
</tbody>
</table>
</div>
) : (
<p className="text-muted ml-3">No inactive VMs</p>
<div className="text-center p-3 bg-light-secondary rounded">
<Monitor size={24} className="text-muted mb-1" />
<p className="text-muted mb-0">No virtual machines found</p>
</div>
)}
</div>
))}

269
sge-frontend/src/views/DataCenterManagement.js
View File

@@ -28,7 +28,8 @@ import { Edit } from "@mui/icons-material";
import { useSnackbar } from "notistack";
import { default as SweetAlert } from "sweetalert2";
import withReactContent from "sweetalert2-react-content";
import { getDataCenters, createDataCenter, updateDataCenter, deleteDataCenter } from "../redux/actions/dataCenter";
import { getDataCenters, createDataCenter, updateDataCenter, deleteDataCenter, getEmissionScopes } from "../redux/actions/dataCenter";
import { getAreas, getAreasWithCriteria } from "../redux/actions/areas";
import { useTranslation } from "react-i18next";
import { getSectors, getSectorById, getSubSectorById, getConsuptionUnits } from "../redux/actions/datas";
import { getAllEmissionSources } from "../redux/actions/emissionSources";
@@ -105,6 +106,8 @@ const DataCenterManagement = () => {
externalId: "",
number: "",
address: "",
areaId: null,
cityId: null,
latitude: null,
longitude: null,
ayposURL: "",
@@ -119,15 +122,22 @@ const DataCenterManagement = () => {
const [mapPosition, setMapPosition] = useState(null);
const dataCenterStore = useSelector((state) => state.dataCenter);
const dataCenterStore = useSelector((state) => {
console.log('DataCenter Store:', state.dataCenter);
return state.dataCenter;
});
const emissionScopeStore = useSelector((state) => state.emissionScope);
const datasStore = useSelector((state) => state.datas);
const emissionSourceStore = useSelector((state) => state.emissionSources);
const areasStore = useSelector((state) => state.areas);
const [sectorsOptions, setSectorsOptions] = useState([]);
const [subSectorsOptions, setSubSectorsOptions] = useState([]);
const [emissionSourcesOptions, setEmissionSourcesOptions] = useState([]);
const [consuptionUnitsOptions, setConsuptionUnitsOptions] = useState([]);
const [activitySubUnitsOptions, setActivitySubUnitsOptions] = useState([]);
const [emissionScopesOptions, setEmissionScopesOptions] = useState([]);
const [areasOptions, setAreasOptions] = useState([]);
const [citiesOptions, setCitiesOptions] = useState([]);
// Add state for selected sector and sub sector like in data input
const [selectedSector, setSelectedSector] = useState(null);
@@ -172,8 +182,9 @@ const DataCenterManagement = () => {
},
{
name: t("Actions"),
allowOverflow: false,
maxWidth: "150px",
allowOverflow: true,
width: "150px",
center: true,
cell: (row) => {
return (
<div className="d-flex">
@@ -182,7 +193,7 @@ const DataCenterManagement = () => {
<MoreVertical size={15} />
</DropdownToggle>
<DropdownMenu container={"body"} end>
{permissionCheck("datacenter_update") && (
{permissionCheck("data_center_update") && (
<DropdownItem
tag="a"
className="w-100"
@@ -192,7 +203,7 @@ const DataCenterManagement = () => {
<span className="align-middle ml-50">{t("Cruds.edit")}</span>
</DropdownItem>
)}
{permissionCheck("datacenter_delete") && (
{permissionCheck("data_center_delete") && (
<DropdownItem
tag="a"
className="w-100"
@@ -215,6 +226,8 @@ const DataCenterManagement = () => {
useEffect(() => {
dispatch(getDataCenters());
dispatch(getSectors());
dispatch(getAreas());
dispatch(getEmissionScopes());
}, [dispatch]);
useEffect(() => {
@@ -295,35 +308,69 @@ const DataCenterManagement = () => {
}, [datasStore?.consuptionUnits]);
useEffect(() => {
setEmissionScopesOptions([
{
label: "Şehir İçi",
value: false,
},
{
label: "Şehir Dışı",
value: true,
},
]);
}, []);
if (emissionScopeStore?.emissionScopes) {
setEmissionScopesOptions(
emissionScopeStore.emissionScopes.map((scope) => ({
value: scope.id,
label: scope.tag,
}))
);
}
}, [emissionScopeStore?.emissionScopes]);
// Set areas options when areas data is loaded
useEffect(() => {
if (areasStore?.areas) {
setAreasOptions(
areasStore.areas.map((area) => ({
value: area.id,
label: area.tag,
}))
);
}
}, [areasStore?.areas]);
// Set cities options when selected area changes
useEffect(() => {
if (selectedDataCenter.areaId && areasStore?.areas) {
const selectedArea = areasStore.areas.find(
(area) => area.id === selectedDataCenter.areaId
);
if (selectedArea?.cities) {
setCitiesOptions(
selectedArea.cities.map((city) => ({
value: city.id,
label: city.name,
}))
);
} else {
setCitiesOptions([]);
}
} else {
setCitiesOptions([]);
}
}, [selectedDataCenter.areaId, areasStore?.areas]);
const handleEditDataCenter = (row) => {
console.log('Editing data center:', row);
setEditingDataCenter(row);
setSelectedDataCenter({
name: row.dataCenter,
externalId: row.externalId,
number: row.number,
address: row.address,
externalId: row.externalId?.toString(),
number: row.number?.toString(),
address: row.address || "",
areaId: row.area?.id || null,
cityId: null,
latitude: row.latitude,
longitude: row.longitude,
ayposURL: row.ayposURL,
city: row.city,
emissionScopeId: row.emissionScope?.id,
sectorId: row.sector?.id,
subSectorId: row.subSector?.id,
emissionSourceId: row.emissionSource?.id,
consuptionUnitId: row.consuptionUnit?.id,
activitySubUnitId: row.activitySubUnit?.id
ayposURL: row.ayposURL || "",
city: row.city || "",
emissionScopeId: row.emissionScope?.id || null,
sectorId: row.sector?.id || null,
subSectorId: row.subSector?.id || null,
emissionSourceId: row.emissionSource?.id || null,
consuptionUnitId: row.consuptionUnit?.id || null,
activitySubUnitId: row.activitySubUnit?.id || null
});
// Set the selected sector and sub sector for cascading dropdowns
@@ -364,18 +411,101 @@ const DataCenterManagement = () => {
}
};
const validateForm = () => {
const errors = [];
// Required fields validation
if (!selectedDataCenter.name?.trim()) {
errors.push(t("DataCenter.nameRequired"));
}
if (!selectedDataCenter.externalId?.trim()) {
errors.push(t("DataCenter.externalIdRequired"));
}
if (!selectedDataCenter.sectorId) {
errors.push(t("DataCenter.sectorRequired"));
}
// Number validations
try {
if (selectedDataCenter.externalId) {
const externalId = parseInt(selectedDataCenter.externalId);
if (isNaN(externalId) || externalId < 0) {
errors.push(t("DataCenter.externalIdMustBePositiveNumber"));
}
}
if (selectedDataCenter.number) {
const number = parseInt(selectedDataCenter.number);
if (isNaN(number) || number < 1) {
errors.push(t("DataCenter.numberMustBePositive"));
}
}
} catch (e) {
errors.push(t("DataCenter.invalidNumberFormat"));
}
// Coordinate validations
if (selectedDataCenter.latitude || selectedDataCenter.longitude) {
try {
const lat = parseFloat(selectedDataCenter.latitude);
const lng = parseFloat(selectedDataCenter.longitude);
if (isNaN(lat) || lat < -90 || lat > 90) {
errors.push(t("DataCenter.invalidLatitude"));
}
if (isNaN(lng) || lng < -180 || lng > 180) {
errors.push(t("DataCenter.invalidLongitude"));
}
} catch (e) {
errors.push(t("DataCenter.invalidCoordinates"));
}
}
// URL validation
if (selectedDataCenter.ayposURL?.trim()) {
try {
new URL(selectedDataCenter.ayposURL);
} catch (e) {
errors.push(t("DataCenter.invalidURL"));
}
}
// Relationship validations
if (selectedDataCenter.subSectorId && !selectedDataCenter.sectorId) {
errors.push(t("DataCenter.sectorRequired"));
}
if (selectedDataCenter.emissionSourceId && !selectedDataCenter.subSectorId) {
errors.push(t("DataCenter.subSectorRequired"));
}
if (selectedDataCenter.consuptionUnitId && !selectedDataCenter.emissionSourceId) {
errors.push(t("DataCenter.emissionSourceRequired"));
}
if (selectedDataCenter.activitySubUnitId && !selectedDataCenter.subSectorId) {
errors.push(t("DataCenter.subSectorRequiredForActivity"));
}
return errors;
};
const handleSubmit = async () => {
if (!selectedDataCenter.name || !selectedDataCenter.externalId) {
enqueueSnackbar(t("Common.fillRequiredFields"), { variant: "error" });
const validationErrors = validateForm();
if (validationErrors.length > 0) {
validationErrors.forEach(error => {
enqueueSnackbar(error, { variant: "error" });
});
return;
}
try {
// Ensure number is set for new data centers
// Format data according to GraphQL input type
const dataToSubmit = {
...selectedDataCenter,
number: selectedDataCenter.number || 1, // Default to 1 if not set
city: selectedDataCenter.city, // Add city to the payload
dataCenter: selectedDataCenter.name,
externalId: parseInt(selectedDataCenter.externalId),
number: parseInt(selectedDataCenter.number || "1"),
address: selectedDataCenter.address,
areaId: selectedDataCenter.areaId,
latitude: selectedDataCenter.latitude ? parseFloat(selectedDataCenter.latitude) : null,
longitude: selectedDataCenter.longitude ? parseFloat(selectedDataCenter.longitude) : null,
ayposURL: selectedDataCenter.ayposURL,
emissionScopeId: selectedDataCenter.emissionScopeId,
sectorId: selectedDataCenter.sectorId,
subSectorId: selectedDataCenter.subSectorId,
@@ -394,14 +524,27 @@ const DataCenterManagement = () => {
enqueueSnackbar(t("DataCenter.createSuccess"), { variant: "success" });
}
// Refresh the data centers list
await dispatch(getDataCenters());
handleCloseModal();
} catch (error) {
console.error("Submit error:", error);
// Handle specific error cases
if (error.message?.includes("duplicate")) {
enqueueSnackbar(t("DataCenter.duplicateExternalId"), { variant: "error" });
} else if (error.message?.includes("permission")) {
enqueueSnackbar(t("Common.noPermission"), { variant: "error" });
} else if (error.message?.includes("not found")) {
enqueueSnackbar(t("DataCenter.resourceNotFound"), { variant: "error" });
} else {
enqueueSnackbar(
error?.message || t("DataCenter.submitError"),
{ variant: "error" }
);
}
}
};
const handleCloseModal = () => {
@@ -599,19 +742,49 @@ const DataCenterManagement = () => {
</Col>
<Col sm="6">
<FormGroup>
<Label for="city">{t("DataCenter.city")}</Label>
<Input
type="text"
name="city"
id="city"
placeholder={t("DataCenter.city")}
value={selectedDataCenter.city}
onChange={(e) =>
<Label for="area">Area</Label>
<Select
id="area"
name="area"
placeholder="Select area"
options={areasOptions}
value={areasOptions?.find(
(option) => option.value === selectedDataCenter.areaId
)}
onChange={(option) => {
setSelectedDataCenter({
...selectedDataCenter,
city: e.target.value,
})
}
areaId: option?.value,
cityId: null,
city: "",
});
}}
isClearable
filterOption={customFilterForSelect}
/>
</FormGroup>
</Col>
<Col sm="6">
<FormGroup>
<Label for="city">City</Label>
<Select
id="city"
name="city"
placeholder="Select city"
options={citiesOptions}
value={citiesOptions?.find(
(option) => option.value === selectedDataCenter.cityId
)}
onChange={(option) => {
setSelectedDataCenter({
...selectedDataCenter,
cityId: option?.value,
city: option?.label || "",
});
}}
isClearable
filterOption={customFilterForSelect}
isDisabled={!selectedDataCenter.areaId}
/>
</FormGroup>
</Col>
@@ -670,7 +843,7 @@ const DataCenterManagement = () => {
</Col>
<Col sm="6">
<FormGroup>
<Label for="sector">Sector</Label>
<Label for="sector">Sector <span className="text-danger">*</span></Label>
<Select
id="sector"
name="sector"
@@ -906,7 +1079,9 @@ const DataCenterManagement = () => {
sortIcon={<ChevronDown size={10} />}
paginationDefaultPage={currentPage}
paginationComponent={CustomPagination}
data={dataCenterStore.dataCenters}
data={dataCenterStore?.dataCenters || []}
progressPending={dataCenterStore?.loading}
progressComponent={<div className="text-center p-3">Loading...</div>}
noDataComponent={
<div className="p-2 text-center">
{t("Common.noDataAvailable")}

95
sge-frontend/src/views/DataSet/MainDataTables.js
View File

@@ -13,13 +13,18 @@ function MainDataTables() {
const [error, setError] = useState(null);
useEffect(() => {
const fetchData = async () => {
try {
// Fetch VM emission data
dispatch(getVMEmissionSummary());
setLoading(true);
await dispatch(getVMEmissionSummary());
} catch (err) {
console.error('Error in MainDataTables:', err);
setError(err.message);
} finally {
setLoading(false);
}
};
fetchData();
}, [dispatch]);
// Debug log for store data
@@ -27,71 +32,21 @@ function MainDataTables() {
console.log('Current store data:', mainDataTablesStore);
}, [mainDataTablesStore]);
const [loading, setLoading] = useState(true);
const columns = [
{
header: "VM ID",
accessorKey: "vmId",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "Data Center",
accessorKey: "dataCenter",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "Project",
accessorKey: "project",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "Physical Machine",
accessorKey: "physicalMachine",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "Virtual Machine",
accessorKey: "vmName",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "VM Power (W)",
accessorKey: "vmPower",
Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span>,
},
{
header: "VM Status",
accessorKey: "vmStatus",
Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span>,
},
{
header: "Total Emissions",
accessorKey: "totalEmission",
Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span>,
},
{
header: "CO2",
accessorKey: "co2",
Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span>,
},
{
header: "CH4",
accessorKey: "ch4",
Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span>,
},
{
header: "N2O",
accessorKey: "n2o",
Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span>,
},
{
header: "Created Date",
accessorKey: "createdDate",
Cell: ({ cell }) => (
<span>
{cell.getValue() ? new Date(cell.getValue()).toLocaleString() : "-"}
</span>
),
},
{ header: t("VM ID"), accessorKey: "vmId", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: t("VM Name"), accessorKey: "vmName", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: t("VM Power"), accessorKey: "vmPower", Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span> },
{ header: t("VM Status"), accessorKey: "vmStatus", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: t("Total Emission"), accessorKey: "totalEmission", Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span> },
{ header: t("Created Date"), accessorKey: "createdDate", Cell: ({ cell }) => (<span>{cell.getValue() ? new Date(cell.getValue()).toLocaleString() : "-"}</span>), sortable: true },
{ header: t("Physical Machine"), accessorKey: "physicalMachine", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: t("Project"), accessorKey: "project", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: t("Data Center"), accessorKey: "dataCenter", Cell: ({ cell }) => <span>{cell.getValue() || "-"}</span> },
{ header: "CO2", accessorKey: "co2", Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span> },
{ header: "CH4", accessorKey: "ch4", Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span> },
{ header: "N2O", accessorKey: "n2o", Cell: ({ cell }) => <span>{editNumbers(cell.getValue()) || "-"}</span> },
];
const tableData = mainDataTablesStore?.vmEmissionSummary || [];
@@ -109,7 +64,7 @@ function MainDataTables() {
<div style={{ marginTop: "2%" }}>
<Card>
<CardHeader className="border-bottom">
<CardTitle tag="h4">{t("Carbon Emission Data")}</CardTitle>
<CardTitle tag="h4">{t("Raw Data")}</CardTitle>
</CardHeader>
<MaterialReactTable
columns={columns}
@@ -132,12 +87,14 @@ function MainDataTables() {
pageIndex: 0
},
sorting: [
{ id: 'dataCenter', desc: false }
{ id: 'createdDate', desc: true }
],
density: 'compact'
}}
state={{
isLoading: !mainDataTablesStore?.vmEmissionSummary
isLoading: loading,
showProgressBars: true,
showSkeletons: true,
}}
/>
</Card>