Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TourDataManager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill
TourDataManager
Commits
3a4c4875
Commit
3a4c4875
authored
Oct 12, 2018
by
Kirill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Авторизовывается пользователь и загружаются корректно эстейты
parent
8add35b7
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
109 additions
and
60 deletions
+109
-60
BigantoErrorException.cs
TourDataManager/BigantoErrorException.cs
+24
-0
Db.cs
TourDataManager/Db.cs
+40
-24
Estate.cs
TourDataManager/Entities/Estate.cs
+5
-1
FetchEstatesUseCase.cs
TourDataManager/FetchEstatesUseCase.cs
+9
-27
TourDataManager.cs
TourDataManager/TourDataManager.cs
+25
-3
TourDataManager.csproj
TourDataManager/TourDataManager.csproj
+2
-1
Program.cs
TourDataManagerConsoleApplication/Program.cs
+4
-4
No files found.
TourDataManager/BigantoErrorException.cs
0 → 100644
View file @
3a4c4875
using
System
;
using
System.Collections.Generic
;
namespace
TourDataManager
{
public
class
BigantoErrorException
:
Exception
{
public
BigantoErrorList
ErrorsList
;
public
BigantoErrorException
(
BigantoErrorList
errors
){
ErrorsList
=
errors
;
}
}
public
struct
BigantoErrorList
{
public
List
<
BigantoError
>
Errors
;
}
public
struct
BigantoError
{
public
int
Code
;
public
string
Message
;
public
override
string
ToString
(){
return
$"code=
{
Code
}
;message=
{
Message
}
"
;
}
}
}
\ No newline at end of file
TourDataManager/Db.cs
View file @
3a4c4875
...
@@ -6,28 +6,23 @@ using System.Data.Entity;
...
@@ -6,28 +6,23 @@ using System.Data.Entity;
using
System.Data.Entity.Core.Common
;
using
System.Data.Entity.Core.Common
;
using
System.Data.SQLite
;
using
System.Data.SQLite
;
using
System.Data.SQLite.EF6
;
using
System.Data.SQLite.EF6
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
SQLite.CodeFirst
;
using
SQLite.CodeFirst
;
using
TourDataManager.Entities
;
// ReSharper disable UnusedAutoPropertyAccessor.Global
namespace
TourDataManager
{
namespace
TourDataManager
{
[
Table
(
"Foo"
)]
// ReSharper disable once InconsistentNaming
public
class
Foo
{
public
class
SQLiteConfiguration
:
DbConfiguration
{
public
long
Id
{
get
;
set
;
}
public
SQLiteConfiguration
(){
public
string
Data
{
get
;
set
;
}
}
public
class
SQLiteConfiguration
:
DbConfiguration
{
public
SQLiteConfiguration
()
{
SetProviderFactory
(
"System.Data.SQLite"
,
SQLiteFactory
.
Instance
);
SetProviderFactory
(
"System.Data.SQLite"
,
SQLiteFactory
.
Instance
);
SetProviderFactory
(
"System.Data.SQLite.EF6"
,
SQLiteProviderFactory
.
Instance
);
SetProviderFactory
(
"System.Data.SQLite.EF6"
,
SQLiteProviderFactory
.
Instance
);
SetProviderServices
(
"System.Data.SQLite"
,
(
DbProviderServices
)
SQLiteProviderFactory
.
Instance
.
GetService
(
typeof
(
DbProviderServices
)));
SetProviderServices
(
"System.Data.SQLite"
,
(
DbProviderServices
)
SQLiteProviderFactory
.
Instance
.
GetService
(
typeof
(
DbProviderServices
)));
}
}
}
}
//[DbConfigurationType(typeof(Ef6CodeConfig))]
public
class
MyDbContext
:
DbContext
{
public
class
MyDbContext
:
DbContext
{
public
MyDbContext
(
DbConnection
connection
,
bool
contextOwnsConnection
)
public
MyDbContext
(
DbConnection
connection
,
bool
contextOwnsConnection
)
...
@@ -40,31 +35,52 @@ namespace TourDataManager {
...
@@ -40,31 +35,52 @@ namespace TourDataManager {
protected
override
void
OnModelCreating
(
DbModelBuilder
modelBuilder
){
protected
override
void
OnModelCreating
(
DbModelBuilder
modelBuilder
){
//modelBuilder.Entity<Foo>();
// Эта штука отключает самостоятельную генерацию Id и позволяет мне самому устанавливать Id
var
sqliteConnectionInitializer
=
new
SqliteCreateDatabaseIfNotExists
<
MyDbContext
>(
modelBuilder
);
modelBuilder
.
Entity
<
Estate
>().
Property
(
estate
=>
estate
.
Id
)
.
HasDatabaseGeneratedOption
(
DatabaseGeneratedOption
.
None
);
// Ещё, вероятно, помогло бы [DatabaseGenerated(DatabaseGeneratedOption.None)]
var
sqliteConnectionInitializer
=
new
SqliteDropCreateDatabaseWhenModelChanges
<
MyDbContext
>(
modelBuilder
);
Database
.
SetInitializer
(
sqliteConnectionInitializer
);
Database
.
SetInitializer
(
sqliteConnectionInitializer
);
}
}
public
DbSet
<
Foo
>
Foo
{
get
;
set
;
}
public
DbSet
<
Estate
>
Estates
{
get
;
set
;
}
}
}
public
class
Db
{
public
class
Db
:
IDisposable
{
private
SQLiteConnection
connection
;
private
MyDbContext
context
;
public
Db
(){
public
Db
(){
connection
=
new
SQLiteConnection
(
"data source=mylovelybase.sqlite"
);
context
=
new
MyDbContext
(
connection
,
true
);
}
using
(
var
sqLiteConnection
=
new
System
.
Data
.
SQLite
.
SQLiteConnection
(
"data source=mylovelybase.sqlite"
)){
public
Estate
[]
GetEstates
(){
using
(
var
db
=
new
MyDbContext
(
sqLiteConnection
,
true
)){
return
context
.
Estates
.
ToArray
();
db
.
Foo
.
Add
(
new
Foo
{
Id
=
new
Random
().
Next
(
0
,
1000
),
Data
=
"Yolo"
});
}
db
.
SaveChanges
();
public
Task
<
Estate
[
]>
GetEstatesAsync
(){
return
context
.
Estates
.
ToArrayAsync
();
}
//db.Set<Foo>()
public
void
InsertEstates
(
Estate
[]
estates
){
//context.Estates.AddRange(estates);
foreach
(
var
estate
in
estates
){
context
.
Estates
.
Add
(
estate
);
}
}
foreach
(
var
contextEstate
in
context
.
Estates
){
Debug
.
Log
(
contextEstate
.
Id
);
}
}
context
.
SaveChanges
();
}
public
void
Dispose
(){
connection
?.
Dispose
();
}
}
}
}
}
}
\ No newline at end of file
TourDataManager/Entities/Estate.cs
View file @
3a4c4875
using
System.ComponentModel.DataAnnotations
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Serialization
;
using
Newtonsoft.Json.Serialization
;
namespace
TourDataManager.Entities
{
namespace
TourDataManager.Entities
{
public
class
Estate
{
public
class
Estate
{
/// Идентификатор объекта недвижимости
/// Идентификатор объекта недвижимости
public
long
Id
{
get
;
set
;
}
[
Key
]
public
long
Id
{
get
;
set
;
}
public
string
Title
{
get
;
set
;
}
public
string
Title
{
get
;
set
;
}
...
@@ -16,5 +18,7 @@ namespace TourDataManager.Entities {
...
@@ -16,5 +18,7 @@ namespace TourDataManager.Entities {
public
string
Preview
{
get
;
set
;
}
public
string
Preview
{
get
;
set
;
}
public
string
Created
{
get
;
set
;
}
public
string
Created
{
get
;
set
;
}
public
override
string
ToString
(){
return
$"Estate :
{
Id
}
|
{
Title
}
|
{
TourCount
}
|
{
Preview
}
|
{
Created
}
"
;
}
}
}
}
}
\ No newline at end of file
TourDataManager/
Get
EstatesUseCase.cs
→
TourDataManager/
Fetch
EstatesUseCase.cs
View file @
3a4c4875
using
System
;
using
System.Collections.Generic
;
using
System.Net.Http
;
using
System.Net.Http
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Converters
;
using
Newtonsoft.Json.Serialization
;
using
Newtonsoft.Json.Serialization
;
using
Ninject
;
using
Ninject
;
using
TourDataManager.Entities
;
using
TourDataManager.Entities
;
namespace
TourDataManager
{
namespace
TourDataManager
{
public
class
Get
EstatesUseCase
{
public
class
Fetch
EstatesUseCase
{
[
Inject
]
public
HttpClient
httpClient
{
get
;
set
;
}
[
Inject
]
public
HttpClient
HttpClient
{
get
;
set
;
}
[
Inject
]
public
Db
Database
{
get
;
set
;
}
public
struct
BigantoErrorList
{
public
Task
<
Estate
[
]>
FetchEstatesFromDb
(){
public
List
<
BigantoError
>
Errors
;
return
Database
.
GetEstatesAsync
();
}
public
struct
BigantoError
{
public
int
Code
;
public
string
Message
;
public
override
string
ToString
(){
return
$"code=
{
Code
}
;message=
{
Message
}
"
;
}
}
public
class
BigantoErrorException
:
Exception
{
public
BigantoErrorList
ErrorsList
;
public
BigantoErrorException
(
BigantoErrorList
errors
){
ErrorsList
=
errors
;
}
}
}
/// <summary>
/// <summary>
...
@@ -39,9 +21,9 @@ namespace TourDataManager {
...
@@ -39,9 +21,9 @@ namespace TourDataManager {
/// <exception cref="BigantoErrorException">Если вместо массива эстейтов с сервера получены ошибки</exception>
/// <exception cref="BigantoErrorException">Если вместо массива эстейтов с сервера получены ошибки</exception>
/// <exception cref="JsonException">Если вместо массива эстейтов или ошибки пришло нечто иное</exception>
/// <exception cref="JsonException">Если вместо массива эстейтов или ошибки пришло нечто иное</exception>
/// </summary>
/// </summary>
public
async
Task
<
Estate
[
]>
GetEstates
(){
public
async
Task
<
Estate
[
]>
FetchEstatesFromServer
(){
var
response
=
await
h
ttpClient
.
GetAsync
(
"https://biganto.com/api-novus/estates.getList?client=desktopplayer&client_version=3.0&v=2.0"
);
var
response
=
await
H
ttpClient
.
GetAsync
(
"https://biganto.com/api-novus/estates.getList?client=desktopplayer&client_version=3.0&v=2.0"
);
// throw HttpRequestException
// throw HttpRequestException
var
content
=
await
response
.
Content
.
ReadAsStringAsync
();
var
content
=
await
response
.
Content
.
ReadAsStringAsync
();
...
@@ -57,7 +39,7 @@ namespace TourDataManager {
...
@@ -57,7 +39,7 @@ namespace TourDataManager {
if
(
error
==
null
)
return
estates
;
if
(
error
==
null
)
return
estates
;
error
=
null
;
error
=
null
;
// Вместо массив
о
эстейтов в ответе может содержаться json ошибки
// Вместо массив
а
эстейтов в ответе может содержаться json ошибки
// Предпринимается попытка десериализовать ошибки и выкинуть BigantoErrorException
// Предпринимается попытка десериализовать ошибки и выкинуть BigantoErrorException
var
exceptionList
=
JsonConvert
.
DeserializeObject
<
BigantoErrorList
>(
content
,
errorHandlerSettings
);
var
exceptionList
=
JsonConvert
.
DeserializeObject
<
BigantoErrorList
>(
content
,
errorHandlerSettings
);
...
...
TourDataManager/TourDataManager.cs
View file @
3a4c4875
using
System
;
using
System
;
using
System.Data.Entity
;
using
System.Net.Http
;
using
System.Net.Http
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Ninject
;
using
Ninject
;
...
@@ -7,7 +8,16 @@ using TourDataManager.Entities;
...
@@ -7,7 +8,16 @@ using TourDataManager.Entities;
namespace
TourDataManager
{
namespace
TourDataManager
{
/// <summary>
/// Фасад для всего плагина
/// </summary>
public
class
TourDataManager
{
public
class
TourDataManager
{
public
FetchEstatesUseCase
fetch
{
get
;
set
;
}
public
Db
database
{
get
;
set
;
}
private
string
persistentPath
;
private
string
persistentPath
;
private
IKernel
Container
;
private
IKernel
Container
;
...
@@ -15,6 +25,10 @@ namespace TourDataManager {
...
@@ -15,6 +25,10 @@ namespace TourDataManager {
public
TourDataManager
(
string
persistentPath
){
public
TourDataManager
(
string
persistentPath
){
this
.
persistentPath
=
persistentPath
;
this
.
persistentPath
=
persistentPath
;
Container
=
new
StandardKernel
(
new
MyModule
(
persistentPath
));
Container
=
new
StandardKernel
(
new
MyModule
(
persistentPath
));
fetch
=
Container
.
Get
<
FetchEstatesUseCase
>();
database
=
Container
.
Get
<
Db
>();
}
}
public
void
Login
(
string
email
,
string
password
){
public
void
Login
(
string
email
,
string
password
){
...
@@ -26,8 +40,15 @@ namespace TourDataManager {
...
@@ -26,8 +40,15 @@ namespace TourDataManager {
});
});
}
}
public
Task
<
Estate
[
]>
GetEstates
(){
public
async
Task
<
Estate
[
]>
DownloadEstates
(){
return
Container
.
Get
<
GetEstatesUseCase
>().
GetEstates
();
try
{
var
estates
=
await
fetch
.
FetchEstatesFromServer
();
database
.
InsertEstates
(
estates
);
return
estates
;
}
catch
(
Exception
){
Debug
.
Log
(
"Не удалось загрузить эстейты"
);
return
null
;
}
}
}
}
}
...
@@ -51,7 +72,8 @@ namespace TourDataManager {
...
@@ -51,7 +72,8 @@ namespace TourDataManager {
Bind
<
HttpClientHandler
>().
ToConstant
(
httpClientHandler
).
InSingletonScope
();
Bind
<
HttpClientHandler
>().
ToConstant
(
httpClientHandler
).
InSingletonScope
();
Bind
<
HttpClient
>().
ToConstant
(
httpClient
).
InSingletonScope
();
Bind
<
HttpClient
>().
ToConstant
(
httpClient
).
InSingletonScope
();
Bind
<
IAuthenticator
>().
To
<
Authenticator
>().
InSingletonScope
();
Bind
<
IAuthenticator
>().
To
<
Authenticator
>().
InSingletonScope
();
Bind
<
GetEstatesUseCase
>().
ToSelf
().
InSingletonScope
();
Bind
<
FetchEstatesUseCase
>().
ToSelf
().
InSingletonScope
();
Bind
<
Db
>().
ToSelf
().
InSingletonScope
();
}
}
}
}
...
...
TourDataManager/TourDataManager.csproj
View file @
3a4c4875
...
@@ -104,12 +104,13 @@
...
@@ -104,12 +104,13 @@
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile
Include=
"Authenticator.cs"
/>
<Compile
Include=
"Authenticator.cs"
/>
<Compile
Include=
"BigantoErrorException.cs"
/>
<Compile
Include=
"CookieStorage.cs"
/>
<Compile
Include=
"CookieStorage.cs"
/>
<Compile
Include=
"Db.cs"
/>
<Compile
Include=
"Db.cs"
/>
<Compile
Include=
"Debug.cs"
/>
<Compile
Include=
"Debug.cs"
/>
<Compile
Include=
"Entities\Estate.cs"
/>
<Compile
Include=
"Entities\Estate.cs"
/>
<Compile
Include=
"Entities\Tour.cs"
/>
<Compile
Include=
"Entities\Tour.cs"
/>
<Compile
Include=
"
Get
EstatesUseCase.cs"
/>
<Compile
Include=
"
Fetch
EstatesUseCase.cs"
/>
<Compile
Include=
"IAuthenticator.cs"
/>
<Compile
Include=
"IAuthenticator.cs"
/>
<Compile
Include=
"Properties\AssemblyInfo.cs"
/>
<Compile
Include=
"Properties\AssemblyInfo.cs"
/>
<Compile
Include=
"TourDataManager.cs"
/>
<Compile
Include=
"TourDataManager.cs"
/>
...
...
TourDataManagerConsoleApplication/Program.cs
View file @
3a4c4875
...
@@ -16,11 +16,11 @@ namespace TourDataManagerConsoleApplication {
...
@@ -16,11 +16,11 @@ namespace TourDataManagerConsoleApplication {
//new Db();
//new Db();
tourDataManager
.
GetEstates
().
ContinueWith
(
task
=>
{
tourDataManager
.
DownloadEstates
().
ContinueWith
(
task
=>
{
foreach
(
var
estate
in
task
.
Result
){
var
est
=
task
.
Result
;
Debug
.
Log
(
estate
);
}
});
});
Console
.
Read
();
Console
.
Read
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment