Skip to content

fixbug: can not add item if the key exist in different group #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kklldog merged 2 commits into from
Dec 22, 2025
Merged

fixbug: can not add item if the key exist in different group #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a85977
fixbug: can not add item if the key exist different group
Dec 22, 2025
c4473d4
Update version no
Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AssemblyVersion>1.11.1</AssemblyVersion>
<Version>1.11.1</Version>
<PackageVersion>1.11.1</PackageVersion>
<AssemblyVersion>1.11.2</AssemblyVersion>
<Version>1.11.2</Version>
<PackageVersion>1.11.2</PackageVersion>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<FileVersion>1.11.1</FileVersion>
<FileVersion>1.11.2</FileVersion>
<Authors>kklldog</Authors>
<Company>kklldog</Company>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/AgileConfig.Server.Service/ConfigService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ public async Task<Config> GetByAppIdKeyEnv(string appId, string group, string ke
if (string.IsNullOrEmpty(group))
{
Expression<Func<Config, bool>> exp1 = c => c.Group == "" || c.Group == null;
exp.And(exp1);
exp = exp.And(exp1);
}
else
{
Expression<Func<Config, bool>> exp1 = c => c.Group == group;
exp.And(exp1);
exp = exp.And(exp1);
}

using var repository = _configRepositoryAccessor(env);
Expand Down
32 changes: 28 additions & 4 deletions test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,9 @@ public async Task GetByAppIdKeyTest()
ClearData();

var env = "DEV";
var id = Guid.NewGuid().ToString();
var appid1 = Guid.NewGuid().ToString();
var appid2 = Guid.NewGuid().ToString();

var id = Guid.NewGuid().ToString();
var source = new Config
{
AppId = appid1,
Expand Down Expand Up @@ -366,18 +365,43 @@ public async Task GetByAppIdKeyTest()
OnlineStatus = OnlineStatus.Online,
Env = env
};
var id3 = Guid.NewGuid().ToString();
var source3 = new Config
{
AppId = appid1,
Id = id3,
Group = "",
Key = "k",
Value = "v",
Description = "d1",
CreateTime = DateTime.Now,
UpdateTime = DateTime.Now,
Status = ConfigStatus.Enabled,
OnlineStatus = OnlineStatus.Online,
Env = env
};
var result = await _service.AddAsync(source, env);
Assert.IsTrue(result);
var result1 = await _service.AddAsync(source1, env);
Assert.IsTrue(result1);
var result2 = await _service.AddAsync(source2, env);
Assert.IsTrue(result2);
var result3 = await _service.AddAsync(source3, env);
Assert.IsTrue(result3);

var config = await _service.GetByAppIdKeyEnv(appid1, "g", "k", env);
Assert.IsNotNull(config);
Assert.AreEqual("g", config.Group);
Assert.AreEqual("k", config.Key);
Assert.AreEqual("v", config.Value);
var config1 = await _service.GetByAppIdKeyEnv(appid1, "", "k", env);
Assert.IsNotNull(config1);
Assert.AreEqual("", config1.Group);
Assert.AreEqual("k", config1.Key);
Assert.AreEqual("v", config1.Value);

var config1 = await _service.GetByAppIdKeyEnv(appid2, "g", "k", env);
Assert.IsNull(config1);
var config2 = await _service.GetByAppIdKeyEnv(appid2, "g", "k", env);
Assert.IsNull(config2);
}

[TestMethod]
Expand Down
Loading