diff --git a/be_poc/api/fixtures/dummy_accounts.json b/be_poc/api/fixtures/dummy_accounts.json index 018b66c935..bc4b04401d 100644 --- a/be_poc/api/fixtures/dummy_accounts.json +++ b/be_poc/api/fixtures/dummy_accounts.json @@ -6,7 +6,7 @@ "name": "prod", "inserted_at": "2024-06-25T09:03:20.273Z", "updated_at": "2024-06-25T09:03:20.273Z", - "aws_account_id": "1234567890", + "aws_account_id": "232136659152", "scan_window_start_at": "2024-06-29T09:03:17Z" } }, @@ -17,7 +17,7 @@ "name": "platform", "inserted_at": "2024-06-25T09:03:08.847Z", "updated_at": "2024-06-25T09:03:08.847Z", - "aws_account_id": "1234567890", + "aws_account_id": "714274078102", "scan_window_start_at": "2024-06-28T09:03:08Z" } }, @@ -28,7 +28,7 @@ "name": "dev", "inserted_at": "2024-06-25T09:02:34.188Z", "updated_at": "2024-06-25T09:02:34.188Z", - "aws_account_id": "12345467890", + "aws_account_id": "106908755756", "scan_window_start_at": "2024-06-29T09:02:27Z" } }, @@ -39,7 +39,7 @@ "name": "marketplace", "inserted_at": "2024-06-25T09:02:58.412Z", "updated_at": "2024-06-25T09:02:58.412Z", - "aws_account_id": "1234567890", + "aws_account_id": "879304169158", "scan_window_start_at": "2024-06-27T09:02:57Z" } }, @@ -50,7 +50,7 @@ "name": "management", "inserted_at": "2024-06-25T09:02:46.950Z", "updated_at": "2024-06-25T09:02:46.950Z", - "aws_account_id": "1234567890", + "aws_account_id": "741399645537", "scan_window_start_at": "2024-06-27T09:02:46Z" } }, @@ -67,7 +67,9 @@ "enable": true, "provider_id": "aws", "inserted_at": "2024-06-25T09:03:57.233Z", - "updated_at": "2024-06-25T09:03:57.233Z" + "updated_at": "2024-06-25T09:03:57.233Z", + "alias": "dev", + "connected": true } }, { @@ -83,7 +85,9 @@ "enable": true, "provider_id": "aws", "inserted_at": "2024-06-25T09:04:56.941Z", - "updated_at": "2024-06-25T09:04:56.941Z" + "updated_at": "2024-06-25T09:04:56.941Z", + "alias": "prod", + "connected": true } }, { @@ -99,7 +103,9 @@ "enable": true, "provider_id": "aws", "inserted_at": "2024-06-25T09:04:31.753Z", - "updated_at": "2024-06-25T09:04:31.753Z" + "updated_at": "2024-06-25T09:04:31.753Z", + "alias": "marketplace", + "connected": true } }, { @@ -116,7 +122,9 @@ "enable": true, "provider_id": "aws", "inserted_at": "2024-06-25T09:04:14.567Z", - "updated_at": "2024-06-25T09:04:14.567Z" + "updated_at": "2024-06-25T09:04:14.567Z", + "alias": "management", + "connected": true } }, { @@ -132,7 +140,9 @@ "enable": true, "provider_id": "aws", "inserted_at": "2024-06-25T09:04:44.431Z", - "updated_at": "2024-06-25T09:04:44.431Z" + "updated_at": "2024-06-25T09:04:44.431Z", + "alias": "platform", + "connected": true } }, { diff --git a/be_poc/api/migrations/0005_cloudaccount_alias_cloudaccount_connected.py b/be_poc/api/migrations/0005_cloudaccount_alias_cloudaccount_connected.py new file mode 100644 index 0000000000..9edec907e3 --- /dev/null +++ b/be_poc/api/migrations/0005_cloudaccount_alias_cloudaccount_connected.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.13 on 2024-06-26 07:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0004_remove_account_billing_cancel_at_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='cloudaccount', + name='alias', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='cloudaccount', + name='connected', + field=models.BooleanField(default=False), + ), + ] diff --git a/be_poc/api/models.py b/be_poc/api/models.py index 3fc3ba9278..067c24b0d5 100644 --- a/be_poc/api/models.py +++ b/be_poc/api/models.py @@ -30,6 +30,8 @@ class CloudAccount(models.Model): groups = models.JSONField(default=list) resources = models.IntegerField(default=0) enable = models.BooleanField() + alias = models.CharField(max_length=255, null=True) + connected = models.BooleanField(default=False) provider_id = models.CharField(max_length=255) inserted_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) diff --git a/be_poc/api/serializers.py b/be_poc/api/serializers.py index 2d7a14272f..171a69a73c 100644 --- a/be_poc/api/serializers.py +++ b/be_poc/api/serializers.py @@ -9,9 +9,15 @@ class AccountSerializer(serializers.ModelSerializer): class CloudAccountSerializer(serializers.ModelSerializer): + aws_account_id = serializers.SerializerMethodField() + class Meta: model = CloudAccount fields = "__all__" + extra_fields = ["aws_account_id"] + + def get_aws_account_id(self, obj): + return obj.account_id.aws_account_id class AuditSerializer(serializers.ModelSerializer):