added posting error count
This commit is contained in:
parent
f594aefea8
commit
2258c93e09
4 changed files with 57 additions and 7 deletions
|
@ -23,7 +23,7 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
public class DbInitializerPostgresDal : PostgresBase, IDbInitializerDal
|
public class DbInitializerPostgresDal : PostgresBase, IDbInitializerDal
|
||||||
{
|
{
|
||||||
private readonly PostgresTools _tools;
|
private readonly PostgresTools _tools;
|
||||||
private readonly Version _currentVersion = new Version(2, 2);
|
private readonly Version _currentVersion = new Version(2, 3);
|
||||||
private const string DbVersionType = "db-version";
|
private const string DbVersionType = "db-version";
|
||||||
|
|
||||||
#region Ctor
|
#region Ctor
|
||||||
|
@ -133,7 +133,8 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
{
|
{
|
||||||
new Tuple<Version, Version>(new Version(1,0), new Version(2,0)),
|
new Tuple<Version, Version>(new Version(1,0), new Version(2,0)),
|
||||||
new Tuple<Version, Version>(new Version(2,0), new Version(2,1)),
|
new Tuple<Version, Version>(new Version(2,0), new Version(2,1)),
|
||||||
new Tuple<Version, Version>(new Version(2,1), new Version(2,2))
|
new Tuple<Version, Version>(new Version(2,1), new Version(2,2)),
|
||||||
|
new Tuple<Version, Version>(new Version(2,2), new Version(2,3))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,6 +158,11 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
var addLastSync = $@"ALTER TABLE {_settings.TwitterUserTableName} ADD fetchingErrorCount SMALLINT";
|
var addLastSync = $@"ALTER TABLE {_settings.TwitterUserTableName} ADD fetchingErrorCount SMALLINT";
|
||||||
await _tools.ExecuteRequestAsync(addLastSync);
|
await _tools.ExecuteRequestAsync(addLastSync);
|
||||||
}
|
}
|
||||||
|
else if (from == new Version(2, 2) && to == new Version(2, 3))
|
||||||
|
{
|
||||||
|
var addPostingError = $@"ALTER TABLE {_settings.FollowersTableName} ADD postingErrorCount SMALLINT";
|
||||||
|
await _tools.ExecuteRequestAsync(addPostingError);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
|
|
|
@ -103,13 +103,13 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
if (follower.Id == default) throw new ArgumentException("id");
|
if (follower.Id == default) throw new ArgumentException("id");
|
||||||
|
|
||||||
var serializedDic = JsonConvert.SerializeObject(follower.FollowingsSyncStatus);
|
var serializedDic = JsonConvert.SerializeObject(follower.FollowingsSyncStatus);
|
||||||
var query = $"UPDATE {_settings.FollowersTableName} SET followings = @followings, followingsSyncStatus = CAST(@followingsSyncStatus as json) WHERE id = @id";
|
var query = $"UPDATE {_settings.FollowersTableName} SET followings = @followings, followingsSyncStatus = CAST(@followingsSyncStatus as json), postingErrorCount = @postingErrorCount WHERE id = @id";
|
||||||
|
|
||||||
using (var dbConnection = Connection)
|
using (var dbConnection = Connection)
|
||||||
{
|
{
|
||||||
dbConnection.Open();
|
dbConnection.Open();
|
||||||
|
|
||||||
await dbConnection.QueryAsync(query, new { follower.Id, follower.Followings, followingsSyncStatus = serializedDic });
|
await dbConnection.QueryAsync(query, new { follower.Id, follower.Followings, followingsSyncStatus = serializedDic, postingErrorCount = follower.PostingErrorCount });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +158,8 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
ActorId = follower.ActorId,
|
ActorId = follower.ActorId,
|
||||||
SharedInboxRoute = follower.SharedInboxRoute,
|
SharedInboxRoute = follower.SharedInboxRoute,
|
||||||
Followings = follower.Followings.ToList(),
|
Followings = follower.Followings.ToList(),
|
||||||
FollowingsSyncStatus = JsonConvert.DeserializeObject<Dictionary<int,long>>(follower.FollowingsSyncStatus)
|
FollowingsSyncStatus = JsonConvert.DeserializeObject<Dictionary<int,long>>(follower.FollowingsSyncStatus),
|
||||||
|
PostingErrorCount = follower.PostingErrorCount
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -174,5 +175,6 @@ namespace BirdsiteLive.DAL.Postgres.DataAccessLayers
|
||||||
public string InboxRoute { get; set; }
|
public string InboxRoute { get; set; }
|
||||||
public string SharedInboxRoute { get; set; }
|
public string SharedInboxRoute { get; set; }
|
||||||
public string ActorId { get; set; }
|
public string ActorId { get; set; }
|
||||||
|
public int PostingErrorCount { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -14,5 +14,7 @@ namespace BirdsiteLive.DAL.Models
|
||||||
public string Host { get; set; }
|
public string Host { get; set; }
|
||||||
public string InboxRoute { get; set; }
|
public string InboxRoute { get; set; }
|
||||||
public string SharedInboxRoute { get; set; }
|
public string SharedInboxRoute { get; set; }
|
||||||
|
|
||||||
|
public int PostingErrorCount { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -54,6 +54,7 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
Assert.AreEqual(inboxRoute, result.InboxRoute);
|
Assert.AreEqual(inboxRoute, result.InboxRoute);
|
||||||
Assert.AreEqual(sharedInboxRoute, result.SharedInboxRoute);
|
Assert.AreEqual(sharedInboxRoute, result.SharedInboxRoute);
|
||||||
Assert.AreEqual(actorId, result.ActorId);
|
Assert.AreEqual(actorId, result.ActorId);
|
||||||
|
Assert.AreEqual(0, result.PostingErrorCount);
|
||||||
Assert.AreEqual(following.Length, result.Followings.Count);
|
Assert.AreEqual(following.Length, result.Followings.Count);
|
||||||
Assert.AreEqual(following[0], result.Followings[0]);
|
Assert.AreEqual(following[0], result.Followings[0]);
|
||||||
Assert.AreEqual(followingSync.Count, result.FollowingsSyncStatus.Count);
|
Assert.AreEqual(followingSync.Count, result.FollowingsSyncStatus.Count);
|
||||||
|
@ -83,6 +84,7 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
Assert.AreEqual(sharedInboxRoute, result.SharedInboxRoute);
|
Assert.AreEqual(sharedInboxRoute, result.SharedInboxRoute);
|
||||||
Assert.AreEqual(0, result.Followings.Count);
|
Assert.AreEqual(0, result.Followings.Count);
|
||||||
Assert.AreEqual(0, result.FollowingsSyncStatus.Count);
|
Assert.AreEqual(0, result.FollowingsSyncStatus.Count);
|
||||||
|
Assert.AreEqual(0, result.PostingErrorCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
|
@ -125,6 +127,7 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
Assert.AreEqual(followingSync.Count, result.FollowingsSyncStatus.Count);
|
Assert.AreEqual(followingSync.Count, result.FollowingsSyncStatus.Count);
|
||||||
Assert.AreEqual(followingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
Assert.AreEqual(followingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
||||||
Assert.AreEqual(followingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
Assert.AreEqual(followingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
||||||
|
Assert.AreEqual(0, result.PostingErrorCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
|
@ -276,8 +279,8 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
};
|
};
|
||||||
result.Followings = updatedFollowing.ToList();
|
result.Followings = updatedFollowing.ToList();
|
||||||
result.FollowingsSyncStatus = updatedFollowingSync;
|
result.FollowingsSyncStatus = updatedFollowingSync;
|
||||||
|
result.PostingErrorCount = 10;
|
||||||
|
|
||||||
await dal.UpdateFollowerAsync(result);
|
await dal.UpdateFollowerAsync(result);
|
||||||
result = await dal.GetFollowerAsync(acct, host);
|
result = await dal.GetFollowerAsync(acct, host);
|
||||||
|
|
||||||
|
@ -286,6 +289,7 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
Assert.AreEqual(updatedFollowingSync.Count, result.FollowingsSyncStatus.Count);
|
Assert.AreEqual(updatedFollowingSync.Count, result.FollowingsSyncStatus.Count);
|
||||||
Assert.AreEqual(updatedFollowingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
Assert.AreEqual(updatedFollowingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
||||||
Assert.AreEqual(updatedFollowingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
Assert.AreEqual(updatedFollowingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
||||||
|
Assert.AreEqual(10, result.PostingErrorCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
|
@ -316,6 +320,7 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
};
|
};
|
||||||
result.Followings = updatedFollowing.ToList();
|
result.Followings = updatedFollowing.ToList();
|
||||||
result.FollowingsSyncStatus = updatedFollowingSync;
|
result.FollowingsSyncStatus = updatedFollowingSync;
|
||||||
|
result.PostingErrorCount = 5;
|
||||||
|
|
||||||
await dal.UpdateFollowerAsync(result);
|
await dal.UpdateFollowerAsync(result);
|
||||||
result = await dal.GetFollowerAsync(acct, host);
|
result = await dal.GetFollowerAsync(acct, host);
|
||||||
|
@ -325,6 +330,41 @@ namespace BirdsiteLive.DAL.Postgres.Tests.DataAccessLayers
|
||||||
Assert.AreEqual(updatedFollowingSync.Count, result.FollowingsSyncStatus.Count);
|
Assert.AreEqual(updatedFollowingSync.Count, result.FollowingsSyncStatus.Count);
|
||||||
Assert.AreEqual(updatedFollowingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
Assert.AreEqual(updatedFollowingSync.First().Key, result.FollowingsSyncStatus.First().Key);
|
||||||
Assert.AreEqual(updatedFollowingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
Assert.AreEqual(updatedFollowingSync.First().Value, result.FollowingsSyncStatus.First().Value);
|
||||||
|
Assert.AreEqual(5, result.PostingErrorCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public async Task CreateUpdateAndGetFollower_ResetErrorCount()
|
||||||
|
{
|
||||||
|
var acct = "myhandle";
|
||||||
|
var host = "domain.ext";
|
||||||
|
var following = new[] { 12, 19, 23 };
|
||||||
|
var followingSync = new Dictionary<int, long>()
|
||||||
|
{
|
||||||
|
{12, 165L},
|
||||||
|
{19, 166L},
|
||||||
|
{23, 167L}
|
||||||
|
};
|
||||||
|
var inboxRoute = "/myhandle/inbox";
|
||||||
|
var sharedInboxRoute = "/inbox";
|
||||||
|
var actorId = $"https://{host}/{acct}";
|
||||||
|
|
||||||
|
var dal = new FollowersPostgresDal(_settings);
|
||||||
|
await dal.CreateFollowerAsync(acct, host, inboxRoute, sharedInboxRoute, actorId, following, followingSync);
|
||||||
|
var result = await dal.GetFollowerAsync(acct, host);
|
||||||
|
Assert.AreEqual(0, result.PostingErrorCount);
|
||||||
|
|
||||||
|
result.PostingErrorCount = 5;
|
||||||
|
|
||||||
|
await dal.UpdateFollowerAsync(result);
|
||||||
|
result = await dal.GetFollowerAsync(acct, host);
|
||||||
|
Assert.AreEqual(5, result.PostingErrorCount);
|
||||||
|
|
||||||
|
result.PostingErrorCount = 0;
|
||||||
|
|
||||||
|
await dal.UpdateFollowerAsync(result);
|
||||||
|
result = await dal.GetFollowerAsync(acct, host);
|
||||||
|
Assert.AreEqual(0, result.PostingErrorCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
|
|
Loading…
Add table
Reference in a new issue