fix: Sets org_id on import of mongodbatlas_organization resource (#3513)

* test checks org_id on import

* changelog

* set org_id on read

Author: oarbusi

.changelog/3513.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_organization: Sets org_id on import
+```

internal/service/organization/resource_organization.go

@@ -139,9 +139,6 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		d.SetId("")
 		return diag.FromErr(fmt.Errorf("an error occurred when updating Organization settings: %s", err))
 	}
-	if err := d.Set("org_id", orgID); err != nil {
-		return diag.FromErr(fmt.Errorf("error setting `org_id`: %s", err))
-	}
 	d.SetId(conversion.EncodeStateID(map[string]string{
 		"org_id": orgID,
 	}))
@@ -169,6 +166,9 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
 	if err := d.Set("skip_default_alerts_settings", organization.SkipDefaultAlertsSettings); err != nil {
 		return diag.Errorf("error setting `skip_default_alerts_settings` for organization (%s): %s", orgID, err)
 	}
+	if err := d.Set("org_id", orgID); err != nil {
+		return diag.FromErr(fmt.Errorf("error setting `org_id`: %s", err))
+	}
 
 	settings, _, err := conn.OrganizationsApi.GetOrganizationSettings(ctx, orgID).Execute()
 	if err != nil {

internal/service/organization/resource_organization_test.go

@@ -220,10 +220,11 @@ func TestAccConfigRSOrganization_import(t *testing.T) {
 				Config: configImportSet(orgID, orgName), // Use import so a new organization is not created, the resource must exist in a step before import state is verified.
 			},
 			{
-				ResourceName:      resourceName,
-				ImportStateId:     orgID,
-				ImportState:       true, // Do the import check.
-				ImportStateVerify: true,
+				ResourceName:                         resourceName,
+				ImportStateId:                        orgID,
+				ImportState:                          true, // Do the import check.
+				ImportStateVerify:                    true,
+				ImportStateVerifyIdentifierAttribute: "org_id",
 			},
 			{
 				// Use removed block so the organization is not deleted.