claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update DB to version 8 (company logos).

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-19 14:42:27 +01:00
parent 54e556c792
commit 4196e5539f
11 changed files with 576 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Cicm.Database/Operations/Company.cs
View File

@@ -375,6 +375,25 @@ namespace Cicm.Database
if(!string.IsNullOrWhiteSpace(dataRow["country"].ToString()))
entry.Country = GetIso3166(int.Parse(dataRow["country"].ToString()));
if(GetCompanyLogosByCompany(out List<CompanyLogo> logos, entry.Id))
{
entry.Logos = logos.ToArray();
if(entry.Logos != null && entry.Logos.Length > 0)
if(entry.Logos.Length > 1)
{
int currentYear = 0;
foreach(CompanyLogo logo in entry.Logos)
{
if(logo.Year <= currentYear) continue;
entry.LastLogo = logo;
currentYear = logo.Year;
}
}
else
entry.LastLogo = entry.Logos[0];
}
entries.Add(entry);
}

335
Cicm.Database/Operations/CompanyLogos.cs Normal file
View File

@@ -0,0 +1,335 @@
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
// Filename : CompanyLogo.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
//
// Contains operations to manage company logos.
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
using System;
using System.Collections.Generic;
using System.Data;
using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database
{
public partial class Operations
{
/// <summary>
/// Gets all company logos
/// </summary>
/// <param name="entries">All company logos</param>
/// <returns><c>true</c> if <see cref="entries" /> is correct, <c>false</c> otherwise</returns>
public bool GetCompanyLogos(out List<CompanyLogo> entries)
{
#if DEBUG
Console.WriteLine("Getting all company logos...");
#endif
try
{
const string SQL = "SELECT * from company_logos";
IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbCmd.CommandText = SQL;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbCmd;
dataAdapter.Fill(dataSet);
entries = CompanyLogosFromDataTable(dataSet.Tables[0]);
return true;
}
catch(Exception ex)
{
Console.WriteLine("Error getting company logos.");
Console.WriteLine(ex);
entries = null;
return false;
}
}
/// <summary>
/// Gets the specified number of company logos since the specified start
/// </summary>
/// <param name="entries">List of company_logos</param>
/// <param name="start">Start of query</param>
/// <param name="count">How many entries to retrieve</param>
/// <returns><c>true</c> if <see cref="entries" /> is correct, <c>false</c> otherwise</returns>
public bool GetCompanyLogos(out List<CompanyLogo> entries, ulong start, ulong count)
{
#if DEBUG
Console.WriteLine("Getting {0} company logos from {1}...", count, start);
#endif
try
{
string sql = $"SELECT * FROM company_logos LIMIT {start}, {count}";
IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbCmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbCmd;
dataAdapter.Fill(dataSet);
entries = CompanyLogosFromDataTable(dataSet.Tables[0]);
return true;
}
catch(Exception ex)
{
Console.WriteLine("Error getting company logos.");
Console.WriteLine(ex);
entries = null;
return false;
}
}
/// <summary>
/// Gets company logo by specified id
/// </summary>
/// <param name="id">Id</param>
/// <returns>CompanyLogo with specified id, <c>null</c> if not found or error</returns>
public CompanyLogo GetCompanyLogo(int id)
{
#if DEBUG
Console.WriteLine("Getting company logo with id {0}...", id);
#endif
try
{
string sql = $"SELECT * from company_logos WHERE id = '{id}'";
IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbCmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbCmd;
dataAdapter.Fill(dataSet);
List<CompanyLogo> entries = CompanyLogosFromDataTable(dataSet.Tables[0]);
return entries == null || entries.Count == 0 ? null : entries[0];
}
catch(Exception ex)
{
Console.WriteLine("Error getting company.");
Console.WriteLine(ex);
return null;
}
}
/// <summary>
/// Gets company logo by specified id
/// </summary>
/// <param name="entries">List of company_logos</param>
/// <param name="company">Company id</param>
/// <returns>CompanyLogo with specified id, <c>null</c> if not found or error</returns>
public bool GetCompanyLogosByCompany(out List<CompanyLogo> entries, int company)
{
#if DEBUG
Console.WriteLine("Getting company logos for company {0}...", company);
#endif
try
{
string sql = $"SELECT * FROM company_logos WHERE company_id = {company}";
IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbCmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbCmd;
dataAdapter.Fill(dataSet);
entries = CompanyLogosFromDataTable(dataSet.Tables[0]);
return true;
}
catch(Exception ex)
{
Console.WriteLine("Error getting company logos.");
Console.WriteLine(ex);
entries = null;
return false;
}
}
/// <summary>
/// Counts the number of company logos in the database
/// </summary>
/// <returns>Entries in database</returns>
public long CountCompanyLogos()
{
#if DEBUG
Console.WriteLine("Counting company logos...");
#endif
IDbCommand dbcmd = dbCon.CreateCommand();
dbcmd.CommandText = "SELECT COUNT(*) FROM company_logos";
object count = dbcmd.ExecuteScalar();
dbcmd.Dispose();
try { return Convert.ToInt64(count); }
catch { return 0; }
}
/// <summary>
/// Adds a new company logo to the database
/// </summary>
/// <param name="entry">Entry to add</param>
/// <param name="id">ID of added entry</param>
/// <returns><c>true</c> if added correctly, <c>false</c> otherwise</returns>
public bool AddCompanyLogo(CompanyLogo entry, out long id)
{
#if DEBUG
Console.Write("Adding logo for company id `{0}`...", entry.CompanyId);
#endif
IDbCommand dbcmd = GetCommandCompanyLogo(entry);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
const string SQL =
"INSERT INTO company_logos (company_id, year, logo_guid) VALUES (@company_id, @year, @logo_guid)";
dbcmd.CommandText = SQL;
dbcmd.ExecuteNonQuery();
trans.Commit();
dbcmd.Dispose();
id = dbCore.LastInsertRowId;
#if DEBUG
Console.WriteLine(" id {0}", id);
#endif
return true;
}
/// <summary>
/// Updated a company logo in the database
/// </summary>
/// <param name="entry">Updated entry</param>
/// <returns><c>true</c> if updated correctly, <c>false</c> otherwise</returns>
public bool UpdateCompanyLogo(CompanyLogo entry)
{
#if DEBUG
Console.WriteLine("Updating company logo id `{0}`...", entry.Id);
#endif
IDbCommand dbcmd = GetCommandCompanyLogo(entry);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
string sql = "UPDATE company_logos SET company_id = @company_id, year = @year, logo_guid = @logo_guid " +
$"WHERE id = {entry.Id}";
dbcmd.CommandText = sql;
dbcmd.ExecuteNonQuery();
trans.Commit();
dbcmd.Dispose();
return true;
}
/// <summary>
/// Removes a company logo from the database
/// </summary>
/// <param name="id">ID of entry to remove</param>
/// <returns><c>true</c> if removed correctly, <c>false</c> otherwise</returns>
public bool RemoveCompanyLogo(long id)
{
#if DEBUG
Console.WriteLine("Removing company logo with id `{0}`...", id);
#endif
IDbCommand dbcmd = dbCon.CreateCommand();
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
string sql = $"DELETE FROM company_logos WHERE id = '{id}';";
dbcmd.CommandText = sql;
dbcmd.ExecuteNonQuery();
trans.Commit();
dbcmd.Dispose();
return true;
}
IDbCommand GetCommandCompanyLogo(CompanyLogo entry)
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataParameter param1 = dbcmd.CreateParameter();
IDbDataParameter param2 = dbcmd.CreateParameter();
IDbDataParameter param3 = dbcmd.CreateParameter();
param1.ParameterName = "@company_id";
param2.ParameterName = "@year";
param3.ParameterName = "@logo_guid";
param1.DbType = DbType.String;
param2.DbType = DbType.String;
param3.DbType = DbType.Guid;
param1.Value = entry.CompanyId;
param2.Value = entry.Year;
param3.Value = entry.Guid;
dbcmd.Parameters.Add(param1);
dbcmd.Parameters.Add(param2);
dbcmd.Parameters.Add(param3);
return dbcmd;
}
static List<CompanyLogo> CompanyLogosFromDataTable(DataTable dataTable)
{
List<CompanyLogo> entries = new List<CompanyLogo>();
foreach(DataRow dataRow in dataTable.Rows)
{
CompanyLogo entry = new CompanyLogo
{
Id = int.Parse(dataRow["id"].ToString()),
CompanyId = int.Parse(dataRow["company_id"].ToString()),
Year = int.Parse(dataRow["year"].ToString()),
Guid = Guid.Parse(dataRow["logo_guid"].ToString())
};
entries.Add(entry);
}
return entries;
}
}
}

48
Cicm.Database/Operations/Init.cs
View File

@@ -49,91 +49,95 @@ namespace Cicm.Database
IDbCommand dbCmd = dbCon.CreateCommand();
Console.WriteLine("Creating table `admins`");
dbCmd.CommandText = V7.Admins;
dbCmd.CommandText = V8.Admins;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `browser_tests`");
dbCmd.CommandText = V7.BrowserTests;
dbCmd.CommandText = V8.BrowserTests;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `cicm_db`");
dbCmd.CommandText = V7.CicmDb;
dbCmd.CommandText = V8.CicmDb;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `companies`");
dbCmd.CommandText = V7.Companies;
dbCmd.CommandText = V8.Companies;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `computers`");
dbCmd.CommandText = V7.Computers;
dbCmd.CommandText = V8.Computers;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `consoles`");
dbCmd.CommandText = V7.Consoles;
dbCmd.CommandText = V8.Consoles;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `disk_formats`");
dbCmd.CommandText = V7.DiskFormats;
dbCmd.CommandText = V8.DiskFormats;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `forbidden`");
dbCmd.CommandText = V7.Forbidden;
dbCmd.CommandText = V8.Forbidden;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `gpus`");
dbCmd.CommandText = V7.Gpus;
dbCmd.CommandText = V8.Gpus;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `log`");
dbCmd.CommandText = V7.Logs;
dbCmd.CommandText = V8.Logs;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `money_donations`");
dbCmd.CommandText = V7.MoneyDonations;
dbCmd.CommandText = V8.MoneyDonations;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `music_synths`");
dbCmd.CommandText = V7.MusicSynths;
dbCmd.CommandText = V8.MusicSynths;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `news`");
dbCmd.CommandText = V7.News;
dbCmd.CommandText = V8.News;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `owned_computers`");
dbCmd.CommandText = V7.OwnedComputers;
dbCmd.CommandText = V8.OwnedComputers;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `owned_consoles`");
dbCmd.CommandText = V7.OwnedConsoles;
dbCmd.CommandText = V8.OwnedConsoles;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `processors`");
dbCmd.CommandText = V7.Processors;
dbCmd.CommandText = V8.Processors;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `sound_synths`");
dbCmd.CommandText = V7.SoundSynths;
dbCmd.CommandText = V8.SoundSynths;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `iso3166_1_numeric`");
dbCmd.CommandText = V7.Iso3166Numeric;
dbCmd.CommandText = V8.Iso3166Numeric;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Filling table `iso3166_1_numeric`");
dbCmd.CommandText = V7.Iso3166NumericValues;
dbCmd.CommandText = V8.Iso3166NumericValues;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating foreign keys for table `companies`");
dbCmd.CommandText = V7.CompaniesForeignKeys;
dbCmd.CommandText = V8.CompaniesForeignKeys;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating foreign keys for table `computers`");
dbCmd.CommandText = V7.ComputersForeignKeys;
dbCmd.CommandText = V8.ComputersForeignKeys;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating foreign keys for table `consoles`");
dbCmd.CommandText = V7.ConsolesForeignKeys;
dbCmd.CommandText = V8.ConsolesForeignKeys;
dbCmd.ExecuteNonQuery();
Console.WriteLine("Creating table `company_logos`");
dbCmd.CommandText = V8.CompanyLogos;
dbCmd.ExecuteNonQuery();
return true;

2
Cicm.Database/Operations/Operations.cs
View File

@@ -35,7 +35,7 @@ namespace Cicm.Database
public partial class Operations
{
/// <summary>Last known database version</summary>
const int DB_VERSION = 7;
const int DB_VERSION = 8;
readonly IDbConnection dbCon;
readonly IDbCore dbCore;

25
Cicm.Database/Operations/Update.cs
View File

@@ -103,6 +103,11 @@ namespace Cicm.Database
UpdateDatabaseToV7();
break;
}
case 7:
{
UpdateDatabaseToV8();
break;
}
}
OptimizeDatabase();
@@ -779,6 +784,26 @@ namespace Cicm.Database
dbCmd.Dispose();
}
void UpdateDatabaseToV8()
{
Console.WriteLine("Updating database to version 8");
Console.WriteLine("Creating table `company_logos`");
IDbCommand dbCmd = dbCon.CreateCommand();
IDbTransaction trans = dbCon.BeginTransaction();
dbCmd.Transaction = trans;
dbCmd.CommandText = V8.CompanyLogos;
dbCmd.ExecuteNonQuery();
trans.Commit();
dbCmd.Dispose();
Console.WriteLine("Setting new database version to 8...");
dbCmd = dbCon.CreateCommand();
dbCmd.CommandText = "INSERT INTO cicm_db (version) VALUES ('8')";
dbCmd.ExecuteNonQuery();
dbCmd.Dispose();
}
void OptimizeDatabase()
{
IDbCommand dbCmd = dbCon.CreateCommand();

4
Cicm.Database/Schemas/Company.cs
View File

@@ -47,6 +47,10 @@ namespace Cicm.Database.Schemas
public DateTime Founded;
/// <summary>ID</summary>
public int Id;
/// <summary>Last logo</summary>
public CompanyLogo LastLogo;
/// <summary>Logos</summary>
public CompanyLogo[] Logos;
/// <summary>Name</summary>
public string Name;
/// <summary>Postal code</summary>

47
Cicm.Database/Schemas/CompanyLogo.cs Normal file
View File

@@ -0,0 +1,47 @@
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
// Filename : Company.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
//
// High level representation of a company.
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
using System;
namespace Cicm.Database.Schemas
{
/// <summary>Company logo</summary>
public class CompanyLogo
{
/// <summary>Company ID</summary>
public int CompanyId;
/// <summary>Logo GUID</summary>
public Guid Guid;
/// <summary>Logo ID</summary>
public int Id;
/// <summary>Year when the company started using this logo, null for unknown</summary>
public int Year;
}
}

4
Cicm.Database/Schemas/Sql/V7.cs
View File

@@ -32,9 +32,9 @@ namespace Cicm.Database.Schemas.Sql
{
public static class V7
{
public static readonly string Admins = V5.Admins;
public static readonly string Admins = V6.Admins;
public static readonly string BrowserTests = V5.BrowserTests;
public static readonly string BrowserTests = V6.BrowserTests;
public static readonly string CicmDb = "CREATE TABLE `cicm_db` (\n" +
"`id` int(11) NOT NULL AUTO_INCREMENT,\n" +

97
Cicm.Database/Schemas/Sql/V8.cs Normal file
View File

@@ -0,0 +1,97 @@
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
// Filename : V7.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
//
// Contains SQL queries to create the database version 7.
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
namespace Cicm.Database.Schemas.Sql
{
public static class V8
{
public static readonly string Admins = V7.Admins;
public static readonly string BrowserTests = V7.BrowserTests;
public static readonly string CicmDb = "CREATE TABLE `cicm_db` (\n" +
"`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
"`version` int(11) NOT NULL,\n" +
"`updated` datetime DEFAULT CURRENT_TIMESTAMP,\n" +
"PRIMARY KEY (`id`)\n" + ");\n" +
"INSERT INTO cicm_db (version) VALUES ('8');";
public static readonly string Companies = V7.Companies;
public static readonly string Computers = V7.Computers;
public static readonly string Consoles = V7.Consoles;
public static readonly string DiskFormats = V7.DiskFormats;
public static readonly string Forbidden = V7.Forbidden;
public static readonly string Gpus = V7.Gpus;
public static readonly string Logs = V7.Logs;
public static readonly string MoneyDonations = V7.MoneyDonations;
public static readonly string MusicSynths = V7.MusicSynths;
public static readonly string News = V7.News;
public static readonly string OwnedComputers = V7.OwnedComputers;
public static readonly string OwnedConsoles = V7.OwnedConsoles;
public static readonly string Processors = V7.Processors;
public static readonly string SoundSynths = V7.SoundSynths;
public static readonly string ComputersForeignKeys = V7.ComputersForeignKeys;
public static readonly string ConsolesForeignKeys = V7.ConsolesForeignKeys;
public static readonly string Iso3166Numeric = V7.Iso3166Numeric;
public static readonly string Iso3166NumericValues = V7.Iso3166NumericValues;
public static readonly string CompaniesForeignKeys = V7.CompaniesForeignKeys;
public static readonly string CompanyLogos = "CREATE TABLE IF NOT EXISTS `company_logos` (\n" +
"`id` INT NOT NULL AUTO_INCREMENT,\n" +
"`company_id` INT(11) NOT NULL,\n" +
"`year` INT(4) DEFAULT NULL,\n" +
"`logo_guid` CHAR(36) NOT NULL,\n" +
"PRIMARY KEY (`id`, `company_id`, `logo_guid`),\n" +
"UNIQUE INDEX `idx_id` (`id` ASC),\n" +
"INDEX `idx_company_id` (`company_id` ASC),\n" +
"INDEX `idx_guid` (`logo_guid` ASC),\n" +
"CONSTRAINT `fk_company_logos_company1`\n" +
"FOREIGN KEY (`company_id`)\n" +
"REFERENCES `companies` (`id`))";
}
}

23
cicm_web/Models/Company.cs
View File

@@ -45,6 +45,8 @@ namespace cicm_web.Models
public string Facebook;
public DateTime Founded;
public int Id;
public CompanyLogo LastLogo;
public CompanyLogo[] Logos;
public string Name;
public string PostalCode;
public string Province;
@@ -77,7 +79,9 @@ namespace cicm_web.Models
SoldTo = dbItem.SoldTo,
Status = dbItem.Status,
Twitter = dbItem.Twitter,
Website = dbItem.Website
Website = dbItem.Website,
Logos = dbItem.Logos,
LastLogo = dbItem.LastLogo
};
}
@@ -104,7 +108,9 @@ namespace cicm_web.Models
SoldTo = t.SoldTo,
Status = t.Status,
Twitter = t.Twitter,
Website = t.Website
Website = t.Website,
Logos = t.Logos,
LastLogo = t.LastLogo
}).OrderBy(t => t.Name).ToArray();
}
@@ -133,7 +139,9 @@ namespace cicm_web.Models
SoldTo = t.SoldTo,
Status = t.Status,
Twitter = t.Twitter,
Website = t.Website
Website = t.Website,
Logos = t.Logos,
LastLogo = t.LastLogo
}).OrderBy(t => t.Name).ToArray();
}
}
@@ -141,13 +149,14 @@ namespace cicm_web.Models
public class Company
{
public int Id;
public CompanyLogo LastLogo;
public string Name;
public static Company GetItem(int id)
{
Cicm.Database.Schemas.Company dbItem = Program.Database?.Operations.GetCompany(id);
return dbItem == null ? null : new Company {Name = dbItem.Name, Id = dbItem.Id};
return dbItem == null ? null : new Company {Name = dbItem.Name, Id = dbItem.Id, LastLogo = dbItem.LastLogo};
}
public static Company[] GetAllItems()
@@ -156,7 +165,8 @@ namespace cicm_web.Models
bool? result = Program.Database?.Operations.GetCompanies(out dbItems);
if(result == null || result.Value == false || dbItems == null) return null;
return dbItems.Select(t => new Company {Id = t.Id, Name = t.Name}).OrderBy(t => t.Name).ToArray();
return dbItems.Select(t => new Company {Id = t.Id, Name = t.Name, LastLogo = t.LastLogo})
.OrderBy(t => t.Name).ToArray();
}
public static Company[] GetItemsStartingWithLetter(char letter)
@@ -167,7 +177,8 @@ namespace cicm_web.Models
return dbItems
.Where(t => t.Name.StartsWith(new string(letter, 1), StringComparison.InvariantCultureIgnoreCase))
.Select(t => new Company {Id = t.Id, Name = t.Name}).OrderBy(t => t.Name).ToArray();
.Select(t => new Company {Id = t.Id, Name = t.Name, LastLogo = t.LastLogo}).OrderBy(t => t.Name)
.ToArray();
}
}
}

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>3.0.99.140</Version>
<Version>3.0.99.143</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>